Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update haproxy #18167

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Update haproxy #18167

merged 1 commit into from
Dec 27, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 27, 2024

Changes:

Changes:

- docker-library/haproxy@10d18fd: Update 3.2 to 3.2-dev2
- docker-library/haproxy@db0d271: Simplify and update `verify-templating.yml`
@tianon tianon requested a review from a team as a code owner December 27, 2024 06:58
Copy link

Diff for ef3a650:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6c93a34..8cda63b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -66,12 +66,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 3.1/alpine
 
-Tags: 3.2-dev1, 3.2-dev, 3.2-dev1-bookworm, 3.2-dev-bookworm
+Tags: 3.2-dev2, 3.2-dev, 3.2-dev2-bookworm, 3.2-dev-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 98981317e3520043f10841a76e8c0f691b29037d
+GitCommit: 10d18fdff5067448f4b88fbdac42594a005b60a9
 Directory: 3.2
 
-Tags: 3.2-dev1-alpine, 3.2-dev-alpine, 3.2-dev1-alpine3.21, 3.2-dev-alpine3.21
+Tags: 3.2-dev2-alpine, 3.2-dev-alpine, 3.2-dev2-alpine3.21, 3.2-dev-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
+GitCommit: 10d18fdff5067448f4b88fbdac42594a005b60a9
 Directory: 3.2/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index d57b552..75b5838 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -51,10 +51,10 @@ haproxy:3.1.1-alpine
 haproxy:3.1.1-alpine3.21
 haproxy:3.1.1-bookworm
 haproxy:3.2-dev
-haproxy:3.2-dev1
-haproxy:3.2-dev1-alpine
-haproxy:3.2-dev1-alpine3.21
-haproxy:3.2-dev1-bookworm
+haproxy:3.2-dev2
+haproxy:3.2-dev2-alpine
+haproxy:3.2-dev2-alpine3.21
+haproxy:3.2-dev2-bookworm
 haproxy:3.2-dev-alpine
 haproxy:3.2-dev-alpine3.21
 haproxy:3.2-dev-bookworm
diff --git a/haproxy_3.2-dev-alpine3.21/Dockerfile b/haproxy_3.2-dev-alpine3.21/Dockerfile
index 09842ef..3f23d80 100644
--- a/haproxy_3.2-dev-alpine3.21/Dockerfile
+++ b/haproxy_3.2-dev-alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.2-dev1
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev1.tar.gz
-ENV HAPROXY_SHA256 6fea62b4a1bb6f1f1c9f8ec55bd6c272913b4062a23ebf8411b6b1e2c5007a3f
+ENV HAPROXY_VERSION 3.2-dev2
+ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev2.tar.gz
+ENV HAPROXY_SHA256 fb51e6ca3ab6aed1396d1e27fe2c13822a562933b65790d0b6667423e9a3bf77
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \
diff --git a/haproxy_3.2-dev-bookworm/Dockerfile b/haproxy_3.2-dev-bookworm/Dockerfile
index 878e6bf..651cb6d 100644
--- a/haproxy_3.2-dev-bookworm/Dockerfile
+++ b/haproxy_3.2-dev-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.2-dev1
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev1.tar.gz
-ENV HAPROXY_SHA256 6fea62b4a1bb6f1f1c9f8ec55bd6c272913b4062a23ebf8411b6b1e2c5007a3f
+ENV HAPROXY_VERSION 3.2-dev2
+ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev2.tar.gz
+ENV HAPROXY_SHA256 fb51e6ca3ab6aed1396d1e27fe2c13822a562933b65790d0b6667423e9a3bf77
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \

Relevant Maintainers:

@tianon tianon merged commit a750b48 into docker-library:master Dec 27, 2024
20 checks passed
@tianon tianon deleted the haproxy branch December 27, 2024 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants