Update haproxy by tianon · Pull Request #20604 · docker-library/official-images

tianon · 2026-01-08T22:53:17Z

Changes:

docker-library/haproxy@29f17a0: Merge pull request Add QUIC to 3.2+ haproxy#257 from infosiftr/quic
docker-library/haproxy@68b7118: Add pthread emulation to speed up openssl
docker-library/haproxy@54f063d: Add QUIC to 3.2+

Changes: - docker-library/haproxy@29f17a0: Merge pull request docker-library/haproxy#257 from infosiftr/quic - docker-library/haproxy@68b7118: Add pthread emulation to speed up openssl - docker-library/haproxy@54f063d: Add QUIC to 3.2+

github-actions · 2026-01-08T22:54:41Z

Diff for 5fe7d89:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8a1aa93..fec07ce 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,80 +3,80 @@ GitRepo: https://github.com/docker-library/haproxy.git
 
 Tags: 2.4.30, 2.4, 2.4.30-trixie, 2.4-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 2.4
 
 Tags: 2.4.30-alpine, 2.4-alpine, 2.4.30-alpine3.23, 2.4-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bfbedbcbf4d99b4fd71bd9aedab5d9c42ce66005
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 2.4/alpine
 
 Tags: 2.6.23, 2.6, 2.6.23-trixie, 2.6-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 2.6
 
 Tags: 2.6.23-alpine, 2.6-alpine, 2.6.23-alpine3.23, 2.6-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bfbedbcbf4d99b4fd71bd9aedab5d9c42ce66005
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 2.6/alpine
 
 Tags: 2.8.18, 2.8, 2.8.18-trixie, 2.8-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 439f95bfe2bd3e6c15dc852a16d8d2e333d7fa37
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 2.8
 
 Tags: 2.8.18-alpine, 2.8-alpine, 2.8.18-alpine3.23, 2.8-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 439f95bfe2bd3e6c15dc852a16d8d2e333d7fa37
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 2.8/alpine
 
 Tags: 3.0.14, 3.0, 3.0.14-trixie, 3.0-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e319b3b62ba8f22c1dfac44a81bb65a7ed67dac1
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.0
 
 Tags: 3.0.14-alpine, 3.0-alpine, 3.0.14-alpine3.23, 3.0-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e319b3b62ba8f22c1dfac44a81bb65a7ed67dac1
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.0/alpine
 
 Tags: 3.1.12, 3.1, 3.1.12-trixie, 3.1-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6644abc009d377471fb93989b6a9336ce1840e00
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.1
 
 Tags: 3.1.12-alpine, 3.1-alpine, 3.1.12-alpine3.23, 3.1-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6644abc009d377471fb93989b6a9336ce1840e00
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.1/alpine
 
 Tags: 3.2.10, 3.2, lts, 3.2.10-trixie, 3.2-trixie, lts-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb767ff57dbf4d8140b011b7721a007ee6692b2d
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.2
 
 Tags: 3.2.10-alpine, 3.2-alpine, lts-alpine, 3.2.10-alpine3.23, 3.2-alpine3.23, lts-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb767ff57dbf4d8140b011b7721a007ee6692b2d
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.2/alpine
 
 Tags: 3.3.1, 3.3, latest, 3.3.1-trixie, 3.3-trixie, trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bbce9cd3a36531337ab84dbf3f20bb4dad2b1245
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.3
 
 Tags: 3.3.1-alpine, 3.3-alpine, alpine, 3.3.1-alpine3.23, 3.3-alpine3.23, alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bbce9cd3a36531337ab84dbf3f20bb4dad2b1245
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.3/alpine
 
 Tags: 3.4-dev2, 3.4-dev, 3.4-dev2-trixie, 3.4-dev-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a1d78dc260e6efbadce5c60750c3d87569596c20
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.4
 
 Tags: 3.4-dev2-alpine, 3.4-dev-alpine, 3.4-dev2-alpine3.23, 3.4-dev-alpine3.23
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a1d78dc260e6efbadce5c60750c3d87569596c20
+GitCommit: 68b711800e1f0c0ee468db0b73302b4bb61a3761
 Directory: 3.4/alpine
diff --git a/haproxy_2.4-alpine3.23/Dockerfile b/haproxy_2.4-alpine3.23/Dockerfile
index f3fe287..613bf8d 100644
--- a/haproxy_2.4-alpine3.23/Dockerfile
+++ b/haproxy_2.4-alpine3.23/Dockerfile
@@ -63,6 +63,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_2.4-trixie/Dockerfile b/haproxy_2.4-trixie/Dockerfile
index 8063a8f..020ce1e 100644
--- a/haproxy_2.4-trixie/Dockerfile
+++ b/haproxy_2.4-trixie/Dockerfile
@@ -61,6 +61,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_2.6-alpine3.23/Dockerfile b/haproxy_2.6-alpine3.23/Dockerfile
index 37650f3..56790a5 100644
--- a/haproxy_2.6-alpine3.23/Dockerfile
+++ b/haproxy_2.6-alpine3.23/Dockerfile
@@ -63,6 +63,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_2.6-trixie/Dockerfile b/haproxy_2.6-trixie/Dockerfile
index 1ddc6a8..ccef851 100644
--- a/haproxy_2.6-trixie/Dockerfile
+++ b/haproxy_2.6-trixie/Dockerfile
@@ -61,6 +61,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_2.8-alpine3.23/Dockerfile b/haproxy_2.8-alpine3.23/Dockerfile
index d0ee98c..49b5b83 100644
--- a/haproxy_2.8-alpine3.23/Dockerfile
+++ b/haproxy_2.8-alpine3.23/Dockerfile
@@ -63,6 +63,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_2.8-trixie/Dockerfile b/haproxy_2.8-trixie/Dockerfile
index fa96cfd..75e6cc4 100644
--- a/haproxy_2.8-trixie/Dockerfile
+++ b/haproxy_2.8-trixie/Dockerfile
@@ -61,6 +61,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_3.0-alpine3.23/Dockerfile b/haproxy_3.0-alpine3.23/Dockerfile
index e4f5282..61ef285 100644
--- a/haproxy_3.0-alpine3.23/Dockerfile
+++ b/haproxy_3.0-alpine3.23/Dockerfile
@@ -63,6 +63,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_3.0-trixie/Dockerfile b/haproxy_3.0-trixie/Dockerfile
index c1a8414..24565af 100644
--- a/haproxy_3.0-trixie/Dockerfile
+++ b/haproxy_3.0-trixie/Dockerfile
@@ -61,6 +61,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_3.1-alpine3.23/Dockerfile b/haproxy_3.1-alpine3.23/Dockerfile
index c0eddd7..387dcd5 100644
--- a/haproxy_3.1-alpine3.23/Dockerfile
+++ b/haproxy_3.1-alpine3.23/Dockerfile
@@ -63,6 +63,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_3.1-trixie/Dockerfile b/haproxy_3.1-trixie/Dockerfile
index f9a275f..3f89883 100644
--- a/haproxy_3.1-trixie/Dockerfile
+++ b/haproxy_3.1-trixie/Dockerfile
@@ -61,6 +61,8 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_3.4-dev-alpine3.23/Dockerfile b/haproxy_3.4-dev-alpine3.23/Dockerfile
index 8c11616..d7f9a81 100644
--- a/haproxy_3.4-dev-alpine3.23/Dockerfile
+++ b/haproxy_3.4-dev-alpine3.23/Dockerfile
@@ -63,6 +63,12 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
+		# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
+		# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
+		# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
+		USE_QUIC=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_3.4-dev-trixie/Dockerfile b/haproxy_3.4-dev-trixie/Dockerfile
index 9678517..f19775c 100644
--- a/haproxy_3.4-dev-trixie/Dockerfile
+++ b/haproxy_3.4-dev-trixie/Dockerfile
@@ -61,6 +61,12 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
+		# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
+		# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
+		# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
+		USE_QUIC=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_alpine3.23/Dockerfile b/haproxy_alpine3.23/Dockerfile
index fb9d862..ae47bb7 100644
--- a/haproxy_alpine3.23/Dockerfile
+++ b/haproxy_alpine3.23/Dockerfile
@@ -63,6 +63,12 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
+		# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
+		# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
+		# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
+		USE_QUIC=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_lts-alpine3.23/Dockerfile b/haproxy_lts-alpine3.23/Dockerfile
index c59688d..44f511e 100644
--- a/haproxy_lts-alpine3.23/Dockerfile
+++ b/haproxy_lts-alpine3.23/Dockerfile
@@ -63,6 +63,12 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
+		# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
+		# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
+		# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
+		USE_QUIC=1 \
 	'; \
 	\
 	nproc="$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/haproxy_lts-trixie/Dockerfile b/haproxy_lts-trixie/Dockerfile
index 4961a34..1d36921 100644
--- a/haproxy_lts-trixie/Dockerfile
+++ b/haproxy_lts-trixie/Dockerfile
@@ -61,6 +61,12 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
+		# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
+		# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
+		# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
+		USE_QUIC=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \
diff --git a/haproxy_trixie/Dockerfile b/haproxy_trixie/Dockerfile
index 6b013f9..9088d57 100644
--- a/haproxy_trixie/Dockerfile
+++ b/haproxy_trixie/Dockerfile
@@ -61,6 +61,12 @@ RUN set -eux; \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
 		USE_PROMEX=1 \
+		# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
+		USE_PTHREAD_EMULATION=1 \
+		# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
+		# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
+		# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
+		USE_QUIC=1 \
 	'; \
 # https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
 	dpkgArch="$(dpkg --print-architecture)"; \

Relevant Maintainers:

haproxy: @tianon @yosifkit

Update haproxy

5fe7d89

Changes: - docker-library/haproxy@29f17a0: Merge pull request docker-library/haproxy#257 from infosiftr/quic - docker-library/haproxy@68b7118: Add pthread emulation to speed up openssl - docker-library/haproxy@54f063d: Add QUIC to 3.2+

tianon requested a review from a team as a code owner January 8, 2026 22:53

github-actions Bot added the library/haproxy label Jan 8, 2026

yosifkit approved these changes Jan 9, 2026

View reviewed changes

tianon merged commit 49fd123 into docker-library:master Jan 9, 2026
21 checks passed

tianon deleted the haproxy branch January 9, 2026 17:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update haproxy#20604

Update haproxy#20604
tianon merged 1 commit intodocker-library:masterfrom
docker-library-bot:haproxy

tianon commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

tianon commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants