From 54f063daa8774cbd62b4a8cd7367a368f489e44d Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 7 Jan 2026 11:37:50 -0800 Subject: [PATCH] Add QUIC to 3.2+ --- 3.2/Dockerfile | 4 ++++ 3.2/alpine/Dockerfile | 4 ++++ 3.3/Dockerfile | 4 ++++ 3.3/alpine/Dockerfile | 4 ++++ 3.4/Dockerfile | 4 ++++ 3.4/alpine/Dockerfile | 4 ++++ Dockerfile.template | 8 +++++++- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 4961a34..e8453c6 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -61,6 +61,10 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=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/3.2/alpine/Dockerfile b/3.2/alpine/Dockerfile index c59688d..3ef4cb6 100644 --- a/3.2/alpine/Dockerfile +++ b/3.2/alpine/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=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/3.3/Dockerfile b/3.3/Dockerfile index 6b013f9..7d35702 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -61,6 +61,10 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=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/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile index fb9d862..b45f425 100644 --- a/3.3/alpine/Dockerfile +++ b/3.3/alpine/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=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/3.4/Dockerfile b/3.4/Dockerfile index 9678517..f25e73c 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -61,6 +61,10 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=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/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index 8c11616..0222ddc 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=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/Dockerfile.template b/Dockerfile.template index c7a7d1b..026d755 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -119,6 +119,12 @@ RUN set -eux; \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_PROMEX=1 \ +{{ if env.version | IN("2.4", "2.6", "2.8", "3.0", "3.1") then "" else ( -}} + # 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 \ +{{ ) end -}} '; \ {{ if env.variant == "alpine" then ( -}} \ @@ -177,7 +183,7 @@ ENTRYPOINT ["docker-entrypoint.sh"] USER haproxy -{{ if [ "2.4", "2.6" ] | index(env.version) then ( -}} +{{ if env.version | IN("2.4", "2.6") then ( -}} # no WORKDIR for backwards compatibility (to try to avoid breaking existing users) {{ ) else ( -}} # https://github.com/docker-library/haproxy/issues/200