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 #18073

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Update haproxy #18073

merged 1 commit into from
Dec 11, 2024

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/haproxy@9898131: Update 3.2 to 3.2-dev1
- docker-library/haproxy@dc5f5ce: Update 3.1 to 3.1.1
@yosifkit yosifkit requested a review from a team as a code owner December 11, 2024 18:58
Copy link

Diff for 08bca6d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 84ab995..c0c2f53 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -56,22 +56,22 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 7341cb2441f9663fb52866df74ccb427960cc8c9
 Directory: 3.0/alpine
 
-Tags: 3.1.0, 3.1, latest, 3.1.0-bookworm, 3.1-bookworm, bookworm
+Tags: 3.1.1, 3.1, latest, 3.1.1-bookworm, 3.1-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 845b6f45ac1a8e0ee5706a23ef2fbf56516aebc6
+GitCommit: dc5f5ce22146dc39f7597ab9f857f0408622c8d8
 Directory: 3.1
 
-Tags: 3.1.0-alpine, 3.1-alpine, alpine, 3.1.0-alpine3.20, 3.1-alpine3.20, alpine3.20
+Tags: 3.1.1-alpine, 3.1-alpine, alpine, 3.1.1-alpine3.20, 3.1-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 845b6f45ac1a8e0ee5706a23ef2fbf56516aebc6
+GitCommit: dc5f5ce22146dc39f7597ab9f857f0408622c8d8
 Directory: 3.1/alpine
 
-Tags: 3.2-dev0, 3.2-dev, 3.2-dev0-bookworm, 3.2-dev-bookworm
+Tags: 3.2-dev1, 3.2-dev, 3.2-dev1-bookworm, 3.2-dev-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 056667a3593e0e18d97518709e30b6bd8574f760
+GitCommit: 98981317e3520043f10841a76e8c0f691b29037d
 Directory: 3.2
 
-Tags: 3.2-dev0-alpine, 3.2-dev-alpine, 3.2-dev0-alpine3.20, 3.2-dev-alpine3.20
+Tags: 3.2-dev1-alpine, 3.2-dev-alpine, 3.2-dev1-alpine3.20, 3.2-dev-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 056667a3593e0e18d97518709e30b6bd8574f760
+GitCommit: 98981317e3520043f10841a76e8c0f691b29037d
 Directory: 3.2/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 48e0b45..4792278 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,14 +46,15 @@ haproxy:3.1
 haproxy:3.1-alpine
 haproxy:3.1-alpine3.20
 haproxy:3.1-bookworm
-haproxy:3.1.0
-haproxy:3.1.0-alpine
-haproxy:3.1.0-alpine3.20
-haproxy:3.1.0-bookworm
-haproxy:3.2-dev0
-haproxy:3.2-dev0-alpine
-haproxy:3.2-dev0-alpine3.20
-haproxy:3.2-dev0-bookworm
+haproxy:3.1.1
+haproxy:3.1.1-alpine
+haproxy:3.1.1-alpine3.20
+haproxy:3.1.1-bookworm
+haproxy:3.2-dev
+haproxy:3.2-dev1
+haproxy:3.2-dev1-alpine
+haproxy:3.2-dev1-alpine3.20
+haproxy:3.2-dev1-bookworm
 haproxy:3.2-dev-alpine
 haproxy:3.2-dev-alpine3.20
 haproxy:3.2-dev-bookworm
diff --git a/haproxy_3.2-dev-alpine3.20/Dockerfile b/haproxy_3.2-dev-alpine3.20/Dockerfile
index b0d5362..2c7cde3 100644
--- a/haproxy_3.2-dev-alpine3.20/Dockerfile
+++ b/haproxy_3.2-dev-alpine3.20/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.2-dev0
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev0.tar.gz
-ENV HAPROXY_SHA256 2329076acae142e399febfe3a9f1e01418f37d6ca33d8090599ecb7e79423c47
+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
 
 # 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 d33860f..878e6bf 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-dev0
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev0.tar.gz
-ENV HAPROXY_SHA256 2329076acae142e399febfe3a9f1e01418f37d6ca33d8090599ecb7e79423c47
+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
 
 # 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_alpine3.20/Dockerfile b/haproxy_alpine3.20/Dockerfile
index aac6c48..c42b48c 100644
--- a/haproxy_alpine3.20/Dockerfile
+++ b/haproxy_alpine3.20/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.1.0
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.0.tar.gz
-ENV HAPROXY_SHA256 56a1468574ab411dcabde837f96bea6cf3c2eb90e279469f75ed1dcdc70fce11
+ENV HAPROXY_VERSION 3.1.1
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.1.tar.gz
+ENV HAPROXY_SHA256 8c1b5d439ba4b278e602445c57e20067adef214dc9c44c2a1cf172fad5f7d273
 
 # 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_bookworm/Dockerfile b/haproxy_bookworm/Dockerfile
index bab2041..52e2e24 100644
--- a/haproxy_bookworm/Dockerfile
+++ b/haproxy_bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.1.0
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.0.tar.gz
-ENV HAPROXY_SHA256 56a1468574ab411dcabde837f96bea6cf3c2eb90e279469f75ed1dcdc70fce11
+ENV HAPROXY_VERSION 3.1.1
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.1.tar.gz
+ENV HAPROXY_SHA256 8c1b5d439ba4b278e602445c57e20067adef214dc9c44c2a1cf172fad5f7d273
 
 # 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 6ba2ca5 into docker-library:master Dec 11, 2024
20 checks passed
@tianon tianon deleted the haproxy branch December 11, 2024 21:42
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.

4 participants