Update haproxy #19119
Merged
Update haproxy #19119
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/haproxy@fa46153: Merge pull request docker-library/haproxy#246 from infosiftr/3.3 - docker-library/haproxy@f60ffd8: Add 3.3, update "latest" and "lts" to 3.2 - docker-library/haproxy@788f347: Update 3.2 to 3.2.0
Diff for e1904ab:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 281f382..5fc04ef 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -36,32 +36,42 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 82d8d0e917b2dbba726f6cf853688d1bb6eed5fc
Directory: 2.8/alpine
-Tags: 3.0.10, 3.0, lts, 3.0.10-bookworm, 3.0-bookworm, lts-bookworm
+Tags: 3.0.10, 3.0, 3.0.10-bookworm, 3.0-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: dccf0f4e3aa2c74e30a89954cba69305e52edf7f
Directory: 3.0
-Tags: 3.0.10-alpine, 3.0-alpine, lts-alpine, 3.0.10-alpine3.21, 3.0-alpine3.21, lts-alpine3.21
+Tags: 3.0.10-alpine, 3.0-alpine, 3.0.10-alpine3.21, 3.0-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: dccf0f4e3aa2c74e30a89954cba69305e52edf7f
Directory: 3.0/alpine
-Tags: 3.1.7, 3.1, latest, 3.1.7-bookworm, 3.1-bookworm, bookworm
+Tags: 3.1.7, 3.1, 3.1.7-bookworm, 3.1-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 923a92620c9c0277c5d52f3c8734fefe612cadfd
Directory: 3.1
-Tags: 3.1.7-alpine, 3.1-alpine, alpine, 3.1.7-alpine3.21, 3.1-alpine3.21, alpine3.21
+Tags: 3.1.7-alpine, 3.1-alpine, 3.1.7-alpine3.21, 3.1-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 923a92620c9c0277c5d52f3c8734fefe612cadfd
Directory: 3.1/alpine
-Tags: 3.2-dev17, 3.2-dev, 3.2-dev17-bookworm, 3.2-dev-bookworm
+Tags: 3.2.0, 3.2, latest, lts, 3.2.0-bookworm, 3.2-bookworm, bookworm, lts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 70c305c6007707c7647fb1d019632a9bbfb6a739
+GitCommit: 788f34715b0b1ef626761dcca1a4e996316a9c6e
Directory: 3.2
-Tags: 3.2-dev17-alpine, 3.2-dev-alpine, 3.2-dev17-alpine3.21, 3.2-dev-alpine3.21
+Tags: 3.2.0-alpine, 3.2-alpine, alpine, lts-alpine, 3.2.0-alpine3.21, 3.2-alpine3.21, alpine3.21, lts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 70c305c6007707c7647fb1d019632a9bbfb6a739
+GitCommit: 788f34715b0b1ef626761dcca1a4e996316a9c6e
Directory: 3.2/alpine
+
+Tags: 3.3-dev0, 3.3-dev, 3.3-dev0-bookworm, 3.3-dev-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: f60ffd8842e34ca4d65267b72139c32dc821736b
+Directory: 3.3
+
+Tags: 3.3-dev0-alpine, 3.3-dev-alpine, 3.3-dev0-alpine3.21, 3.3-dev-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f60ffd8842e34ca4d65267b72139c32dc821736b
+Directory: 3.3/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 4476f9b..d1f7865 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -42,14 +42,21 @@ haproxy:3.1.7
haproxy:3.1.7-alpine
haproxy:3.1.7-alpine3.21
haproxy:3.1.7-bookworm
-haproxy:3.2-dev
-haproxy:3.2-dev17
-haproxy:3.2-dev17-alpine
-haproxy:3.2-dev17-alpine3.21
-haproxy:3.2-dev17-bookworm
-haproxy:3.2-dev-alpine
-haproxy:3.2-dev-alpine3.21
-haproxy:3.2-dev-bookworm
+haproxy:3.2
+haproxy:3.2-alpine
+haproxy:3.2-alpine3.21
+haproxy:3.2-bookworm
+haproxy:3.2.0
+haproxy:3.2.0-alpine
+haproxy:3.2.0-alpine3.21
+haproxy:3.2.0-bookworm
+haproxy:3.3-dev0
+haproxy:3.3-dev0-alpine
+haproxy:3.3-dev0-alpine3.21
+haproxy:3.3-dev0-bookworm
+haproxy:3.3-dev-alpine
+haproxy:3.3-dev-alpine3.21
+haproxy:3.3-dev-bookworm
haproxy:alpine
haproxy:alpine3.21
haproxy:bookworm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c4549d1..61f3078 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -5,9 +5,11 @@ haproxy:2.6-alpine3.21
haproxy:2.6-bookworm
haproxy:2.8-alpine3.21
haproxy:2.8-bookworm
-haproxy:3.2-dev-alpine3.21
-haproxy:3.2-dev-bookworm
-haproxy:alpine3.21
-haproxy:bookworm
+haproxy:3.0-alpine3.21
+haproxy:3.0-bookworm
+haproxy:3.1-alpine3.21
+haproxy:3.1-bookworm
+haproxy:3.3-dev-alpine3.21
+haproxy:3.3-dev-bookworm
haproxy:lts-alpine3.21
haproxy:lts-bookworm
diff --git a/haproxy_lts-alpine3.21/Dockerfile b/haproxy_3.0-alpine3.21/Dockerfile
similarity index 100%
copy from haproxy_lts-alpine3.21/Dockerfile
copy to haproxy_3.0-alpine3.21/Dockerfile
diff --git a/haproxy_3.2-dev-alpine3.21/docker-entrypoint.sh b/haproxy_3.0-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.2-dev-alpine3.21/docker-entrypoint.sh
rename to haproxy_3.0-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_lts-bookworm/Dockerfile b/haproxy_3.0-bookworm/Dockerfile
similarity index 100%
copy from haproxy_lts-bookworm/Dockerfile
copy to haproxy_3.0-bookworm/Dockerfile
diff --git a/haproxy_3.2-dev-bookworm/docker-entrypoint.sh b/haproxy_3.0-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.2-dev-bookworm/docker-entrypoint.sh
rename to haproxy_3.0-bookworm/docker-entrypoint.sh
diff --git a/haproxy_alpine3.21/Dockerfile b/haproxy_3.1-alpine3.21/Dockerfile
similarity index 100%
rename from haproxy_alpine3.21/Dockerfile
rename to haproxy_3.1-alpine3.21/Dockerfile
diff --git a/haproxy_alpine3.21/docker-entrypoint.sh b/haproxy_3.1-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_alpine3.21/docker-entrypoint.sh
rename to haproxy_3.1-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_bookworm/Dockerfile b/haproxy_3.1-bookworm/Dockerfile
similarity index 100%
rename from haproxy_bookworm/Dockerfile
rename to haproxy_3.1-bookworm/Dockerfile
diff --git a/haproxy_bookworm/docker-entrypoint.sh b/haproxy_3.1-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_bookworm/docker-entrypoint.sh
rename to haproxy_3.1-bookworm/docker-entrypoint.sh
diff --git a/haproxy_3.2-dev-alpine3.21/Dockerfile b/haproxy_3.3-dev-alpine3.21/Dockerfile
similarity index 92%
rename from haproxy_3.2-dev-alpine3.21/Dockerfile
rename to haproxy_3.3-dev-alpine3.21/Dockerfile
index 73c3cdf..58b2b96 100644
--- a/haproxy_3.2-dev-alpine3.21/Dockerfile
+++ b/haproxy_3.3-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-dev17
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev17.tar.gz
-ENV HAPROXY_SHA256 f621c6b44ce2eff4c4cdcee593c60b96b616fd1ca8af27226f4b99638a1ce5ce
+ENV HAPROXY_VERSION 3.3-dev0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.3/src/devel/haproxy-3.3-dev0.tar.gz
+ENV HAPROXY_SHA256 752d564662c2c909f4788f1173c1f7fdf4492ee8da79a5f81e22e0ecbf2b7f02
# 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_2.2-bullseye/docker-entrypoint.sh b/haproxy_3.3-dev-alpine3.21/docker-entrypoint.sh
similarity index 100%
copy from haproxy_2.2-bullseye/docker-entrypoint.sh
copy to haproxy_3.3-dev-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_3.2-dev-bookworm/Dockerfile b/haproxy_3.3-dev-bookworm/Dockerfile
similarity index 93%
rename from haproxy_3.2-dev-bookworm/Dockerfile
rename to haproxy_3.3-dev-bookworm/Dockerfile
index 01ae9a5..eb2e1b6 100644
--- a/haproxy_3.2-dev-bookworm/Dockerfile
+++ b/haproxy_3.3-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-dev17
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev17.tar.gz
-ENV HAPROXY_SHA256 f621c6b44ce2eff4c4cdcee593c60b96b616fd1ca8af27226f4b99638a1ce5ce
+ENV HAPROXY_VERSION 3.3-dev0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.3/src/devel/haproxy-3.3-dev0.tar.gz
+ENV HAPROXY_SHA256 752d564662c2c909f4788f1173c1f7fdf4492ee8da79a5f81e22e0ecbf2b7f02
# 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_2.2-bullseye/docker-entrypoint.sh b/haproxy_3.3-dev-bookworm/docker-entrypoint.sh
similarity index 100%
copy from haproxy_2.2-bullseye/docker-entrypoint.sh
copy to haproxy_3.3-dev-bookworm/docker-entrypoint.sh
diff --git a/haproxy_lts-alpine3.21/Dockerfile b/haproxy_lts-alpine3.21/Dockerfile
index 50b264f..840f6d3 100644
--- a/haproxy_lts-alpine3.21/Dockerfile
+++ b/haproxy_lts-alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.0.10
-ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/haproxy-3.0.10.tar.gz
-ENV HAPROXY_SHA256 d1508670b6fd5839c669a0a916842f0d3d3d0b578bb351a2a74a1de3d929ce26
+ENV HAPROXY_VERSION 3.2.0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/haproxy-3.2.0.tar.gz
+ENV HAPROXY_SHA256 f762ae31bca1b51feb89e4395e36e17f867c25372a10853c70d292c3dd17b7b0
# 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_lts-bookworm/Dockerfile b/haproxy_lts-bookworm/Dockerfile
index acc9eda..41d842a 100644
--- a/haproxy_lts-bookworm/Dockerfile
+++ b/haproxy_lts-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.0.10
-ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/haproxy-3.0.10.tar.gz
-ENV HAPROXY_SHA256 d1508670b6fd5839c669a0a916842f0d3d3d0b578bb351a2a74a1de3d929ce26
+ENV HAPROXY_VERSION 3.2.0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/haproxy-3.2.0.tar.gz
+ENV HAPROXY_SHA256 f762ae31bca1b51feb89e4395e36e17f867c25372a10853c70d292c3dd17b7b0
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -eux; \Relevant Maintainers: |
yosifkit
approved these changes
May 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: