Update haproxy - #20369
Merged
Merged
Conversation
Changes: - docker-library/haproxy@b95c37f: Merge pull request docker-library/haproxy#255 from TimWolla/haproxy-3.4 - docker-library/haproxy@875a6dd: Update for HAProxy 3.3 Stable Release - docker-library/haproxy@dca811c: Update 3.3 to 3.3.0
Diff for 68ae54e:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 47299bb..2324526 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -51,22 +51,32 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: b1e0ccb02df9fc432364fe391f9b094c1bc8688c
Directory: 3.1/alpine
-Tags: 3.2.9, 3.2, latest, lts, 3.2.9-trixie, 3.2-trixie, trixie, lts-trixie
+Tags: 3.2.9, 3.2, lts, 3.2.9-trixie, 3.2-trixie, lts-trixie
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1721188a635768ae6d4867274f60c65339fbb05e
Directory: 3.2
-Tags: 3.2.9-alpine, 3.2-alpine, alpine, lts-alpine, 3.2.9-alpine3.22, 3.2-alpine3.22, alpine3.22, lts-alpine3.22
+Tags: 3.2.9-alpine, 3.2-alpine, lts-alpine, 3.2.9-alpine3.22, 3.2-alpine3.22, lts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1721188a635768ae6d4867274f60c65339fbb05e
Directory: 3.2/alpine
-Tags: 3.3-dev14, 3.3-dev, 3.3-dev14-trixie, 3.3-dev-trixie
+Tags: 3.3.0, 3.3, latest, 3.3.0-trixie, 3.3-trixie, trixie
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: c1f08bf6346bd77d2862e0f6658f55fda8cc9e06
+GitCommit: dca811ccdc2ce4736f2d3deee9d7f7f233a1d236
Directory: 3.3
-Tags: 3.3-dev14-alpine, 3.3-dev-alpine, 3.3-dev14-alpine3.22, 3.3-dev-alpine3.22
+Tags: 3.3.0-alpine, 3.3-alpine, alpine, 3.3.0-alpine3.22, 3.3-alpine3.22, alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: c1f08bf6346bd77d2862e0f6658f55fda8cc9e06
+GitCommit: dca811ccdc2ce4736f2d3deee9d7f7f233a1d236
Directory: 3.3/alpine
+
+Tags: 3.4-dev0, 3.4-dev, 3.4-dev0-trixie, 3.4-dev-trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 875a6dd82a46bc6474b8fa10003655f6103e7c67
+Directory: 3.4
+
+Tags: 3.4-dev0-alpine, 3.4-dev-alpine, 3.4-dev0-alpine3.22, 3.4-dev-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 875a6dd82a46bc6474b8fa10003655f6103e7c67
+Directory: 3.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index dc97474..bb57fb9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,14 +46,21 @@ haproxy:3.2.9
haproxy:3.2.9-alpine
haproxy:3.2.9-alpine3.22
haproxy:3.2.9-trixie
-haproxy:3.3-dev
-haproxy:3.3-dev14
-haproxy:3.3-dev14-alpine
-haproxy:3.3-dev14-alpine3.22
-haproxy:3.3-dev14-trixie
-haproxy:3.3-dev-alpine
-haproxy:3.3-dev-alpine3.22
-haproxy:3.3-dev-trixie
+haproxy:3.3
+haproxy:3.3-alpine
+haproxy:3.3-alpine3.22
+haproxy:3.3-trixie
+haproxy:3.3.0
+haproxy:3.3.0-alpine
+haproxy:3.3.0-alpine3.22
+haproxy:3.3.0-trixie
+haproxy:3.4-dev0
+haproxy:3.4-dev0-alpine
+haproxy:3.4-dev0-alpine3.22
+haproxy:3.4-dev0-trixie
+haproxy:3.4-dev-alpine
+haproxy:3.4-dev-alpine3.22
+haproxy:3.4-dev-trixie
haproxy:alpine
haproxy:alpine3.22
haproxy:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 55ddfec..053a71c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -8,7 +8,9 @@ haproxy:3.0-alpine3.22
haproxy:3.0-trixie
haproxy:3.1-alpine3.22
haproxy:3.1-trixie
-haproxy:3.3-dev-alpine3.22
-haproxy:3.3-dev-trixie
+haproxy:3.4-dev-alpine3.22
+haproxy:3.4-dev-trixie
+haproxy:alpine3.22
haproxy:lts-alpine3.22
haproxy:lts-trixie
+haproxy:trixie
diff --git a/haproxy_3.3-dev-alpine3.22/Dockerfile b/haproxy_3.4-dev-alpine3.22/Dockerfile
similarity index 93%
rename from haproxy_3.3-dev-alpine3.22/Dockerfile
rename to haproxy_3.4-dev-alpine3.22/Dockerfile
index 48446a4..b845f98 100644
--- a/haproxy_3.3-dev-alpine3.22/Dockerfile
+++ b/haproxy_3.4-dev-alpine3.22/Dockerfile
@@ -30,9 +30,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.3-dev14
-ENV HAPROXY_URL https://www.haproxy.org/download/3.3/src/devel/haproxy-3.3-dev14.tar.gz
-ENV HAPROXY_SHA256 b2f22bc2266b980a486f7d9f1d205a218710d1e68140de44d7ab2ddfa321fa6c
+ENV HAPROXY_VERSION 3.4-dev0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.4/src/devel/haproxy-3.4-dev0.tar.gz
+ENV HAPROXY_SHA256 05e40bd9690b250ba35147f46a0cc3fa0355eb8413958a5a695149fd2f837f5e
# 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.3-dev-alpine3.22/docker-entrypoint.sh b/haproxy_3.4-dev-alpine3.22/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.3-dev-alpine3.22/docker-entrypoint.sh
rename to haproxy_3.4-dev-alpine3.22/docker-entrypoint.sh
diff --git a/haproxy_3.3-dev-trixie/Dockerfile b/haproxy_3.4-dev-trixie/Dockerfile
similarity index 93%
rename from haproxy_3.3-dev-trixie/Dockerfile
rename to haproxy_3.4-dev-trixie/Dockerfile
index 07aa8ad..0720f87 100644
--- a/haproxy_3.3-dev-trixie/Dockerfile
+++ b/haproxy_3.4-dev-trixie/Dockerfile
@@ -30,9 +30,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.3-dev14
-ENV HAPROXY_URL https://www.haproxy.org/download/3.3/src/devel/haproxy-3.3-dev14.tar.gz
-ENV HAPROXY_SHA256 b2f22bc2266b980a486f7d9f1d205a218710d1e68140de44d7ab2ddfa321fa6c
+ENV HAPROXY_VERSION 3.4-dev0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.4/src/devel/haproxy-3.4-dev0.tar.gz
+ENV HAPROXY_SHA256 05e40bd9690b250ba35147f46a0cc3fa0355eb8413958a5a695149fd2f837f5e
# 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.3-dev-trixie/docker-entrypoint.sh b/haproxy_3.4-dev-trixie/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.3-dev-trixie/docker-entrypoint.sh
rename to haproxy_3.4-dev-trixie/docker-entrypoint.sh
diff --git a/haproxy_lts-alpine3.22/Dockerfile b/haproxy_alpine3.22/Dockerfile
similarity index 93%
copy from haproxy_lts-alpine3.22/Dockerfile
copy to haproxy_alpine3.22/Dockerfile
index fdd4f1b..c4e4cef 100644
--- a/haproxy_lts-alpine3.22/Dockerfile
+++ b/haproxy_alpine3.22/Dockerfile
@@ -30,9 +30,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.2.9
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/haproxy-3.2.9.tar.gz
-ENV HAPROXY_SHA256 e660d141b29019f4d198785b0834cc3e9c96efceeb807c2fff2fc935bd3354c2
+ENV HAPROXY_VERSION 3.3.0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.3/src/haproxy-3.3.0.tar.gz
+ENV HAPROXY_SHA256 bf2da6b69f82d7b855be977ab9e1d4704eef5629b657ac72afb5958a869c902e
# 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.4-alpine3.22/docker-entrypoint.sh b/haproxy_alpine3.22/docker-entrypoint.sh
similarity index 100%
copy from haproxy_2.4-alpine3.22/docker-entrypoint.sh
copy to haproxy_alpine3.22/docker-entrypoint.sh
diff --git a/haproxy_lts-trixie/Dockerfile b/haproxy_trixie/Dockerfile
similarity index 94%
copy from haproxy_lts-trixie/Dockerfile
copy to haproxy_trixie/Dockerfile
index 80a2e95..ee05037 100644
--- a/haproxy_lts-trixie/Dockerfile
+++ b/haproxy_trixie/Dockerfile
@@ -30,9 +30,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.2.9
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/haproxy-3.2.9.tar.gz
-ENV HAPROXY_SHA256 e660d141b29019f4d198785b0834cc3e9c96efceeb807c2fff2fc935bd3354c2
+ENV HAPROXY_VERSION 3.3.0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.3/src/haproxy-3.3.0.tar.gz
+ENV HAPROXY_SHA256 bf2da6b69f82d7b855be977ab9e1d4704eef5629b657ac72afb5958a869c902e
# 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.4-alpine3.22/docker-entrypoint.sh b/haproxy_trixie/docker-entrypoint.sh
similarity index 100%
copy from haproxy_2.4-alpine3.22/docker-entrypoint.sh
copy to haproxy_trixie/docker-entrypoint.shRelevant Maintainers: |
yosifkit
approved these changes
Dec 1, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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: