Skip to content

Update haproxy - #20229

Merged
yosifkit merged 1 commit into
docker-library:masterfrom
docker-library-bot:haproxy
Nov 5, 2025
Merged

Update haproxy#20229
yosifkit merged 1 commit into
docker-library:masterfrom
docker-library-bot:haproxy

Conversation

@tianon

@tianon tianon commented Nov 5, 2025

Copy link
Copy Markdown
Member

Changes:

Changes:

- docker-library/haproxy@1f56bf5: Merge pull request docker-library/haproxy#250 from infosiftr/socat
- docker-library/haproxy@3fc3329: Add `socat` to the image
@tianon
tianon requested a review from a team as a code owner November 5, 2025 22:16
@github-actions

github-actions Bot commented Nov 5, 2025

Copy link
Copy Markdown
Diff for 32a10f5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4d4cbaa..7faa708 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,70 +3,70 @@ 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: c55eb01d1a1866a421e20e21bace391080fc58ba
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 2.4
 
 Tags: 2.4.30-alpine, 2.4-alpine, 2.4.30-alpine3.22, 2.4-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: c55eb01d1a1866a421e20e21bace391080fc58ba
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 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: 926111706a0ffd8b815e1edfd317aae52d06d083
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 2.6
 
 Tags: 2.6.23-alpine, 2.6-alpine, 2.6.23-alpine3.22, 2.6-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 926111706a0ffd8b815e1edfd317aae52d06d083
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 2.6/alpine
 
 Tags: 2.8.16, 2.8, 2.8.16-trixie, 2.8-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 97dd996d667932ef9359dcb8f2b3242eb54b253e
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 2.8
 
 Tags: 2.8.16-alpine, 2.8-alpine, 2.8.16-alpine3.22, 2.8-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 97dd996d667932ef9359dcb8f2b3242eb54b253e
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 2.8/alpine
 
 Tags: 3.0.12, 3.0, 3.0.12-trixie, 3.0-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0390f3e72676323955e3a7d230393c7b5478f0b0
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.0
 
 Tags: 3.0.12-alpine, 3.0-alpine, 3.0.12-alpine3.22, 3.0-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0390f3e72676323955e3a7d230393c7b5478f0b0
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.0/alpine
 
 Tags: 3.1.9, 3.1, 3.1.9-trixie, 3.1-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d89f493da93a6e40d26926929cf12bf95fbec5b
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.1
 
 Tags: 3.1.9-alpine, 3.1-alpine, 3.1.9-alpine3.22, 3.1-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d89f493da93a6e40d26926929cf12bf95fbec5b
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.1/alpine
 
 Tags: 3.2.7, 3.2, latest, lts, 3.2.7-trixie, 3.2-trixie, trixie, lts-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e4c0de0b54fc42dd87f22cfb61aad93562dad787
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.2
 
 Tags: 3.2.7-alpine, 3.2-alpine, alpine, lts-alpine, 3.2.7-alpine3.22, 3.2-alpine3.22, alpine3.22, lts-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e4c0de0b54fc42dd87f22cfb61aad93562dad787
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.2/alpine
 
 Tags: 3.3-dev11, 3.3-dev, 3.3-dev11-trixie, 3.3-dev-trixie
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 531c0c0d9c002e8f43ab020ff9e529c6168b287c
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.3
 
 Tags: 3.3-dev11-alpine, 3.3-dev-alpine, 3.3-dev11-alpine3.22, 3.3-dev-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 531c0c0d9c002e8f43ab020ff9e529c6168b287c
+GitCommit: 3fc33290bfe9f17d101aa25f22fac86f4a71e571
 Directory: 3.3/alpine
diff --git a/haproxy_2.4-alpine3.22/Dockerfile b/haproxy_2.4-alpine3.22/Dockerfile
index 769b9a8..5d7ef43 100644
--- a/haproxy_2.4-alpine3.22/Dockerfile
+++ b/haproxy_2.4-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_2.4-trixie/Dockerfile b/haproxy_2.4-trixie/Dockerfile
index 77e626d..8063a8f 100644
--- a/haproxy_2.4-trixie/Dockerfile
+++ b/haproxy_2.4-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean
 
diff --git a/haproxy_2.6-alpine3.22/Dockerfile b/haproxy_2.6-alpine3.22/Dockerfile
index aa3e0ec..94bc78b 100644
--- a/haproxy_2.6-alpine3.22/Dockerfile
+++ b/haproxy_2.6-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_2.6-trixie/Dockerfile b/haproxy_2.6-trixie/Dockerfile
index ec2b0b7..1ddc6a8 100644
--- a/haproxy_2.6-trixie/Dockerfile
+++ b/haproxy_2.6-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean
 
diff --git a/haproxy_2.8-alpine3.22/Dockerfile b/haproxy_2.8-alpine3.22/Dockerfile
index 13f0640..21861cb 100644
--- a/haproxy_2.8-alpine3.22/Dockerfile
+++ b/haproxy_2.8-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_2.8-trixie/Dockerfile b/haproxy_2.8-trixie/Dockerfile
index e3ba749..7bef39c 100644
--- a/haproxy_2.8-trixie/Dockerfile
+++ b/haproxy_2.8-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean
 
diff --git a/haproxy_3.0-alpine3.22/Dockerfile b/haproxy_3.0-alpine3.22/Dockerfile
index 6b06859..3e535c0 100644
--- a/haproxy_3.0-alpine3.22/Dockerfile
+++ b/haproxy_3.0-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_3.0-trixie/Dockerfile b/haproxy_3.0-trixie/Dockerfile
index c30fecf..7e87a7d 100644
--- a/haproxy_3.0-trixie/Dockerfile
+++ b/haproxy_3.0-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean
 
diff --git a/haproxy_3.1-alpine3.22/Dockerfile b/haproxy_3.1-alpine3.22/Dockerfile
index 9235412..0177be4 100644
--- a/haproxy_3.1-alpine3.22/Dockerfile
+++ b/haproxy_3.1-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_3.1-trixie/Dockerfile b/haproxy_3.1-trixie/Dockerfile
index 38b2aa1..3d13a4e 100644
--- a/haproxy_3.1-trixie/Dockerfile
+++ b/haproxy_3.1-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean
 
diff --git a/haproxy_3.3-dev-alpine3.22/Dockerfile b/haproxy_3.3-dev-alpine3.22/Dockerfile
index 9959960..a5cf7c8 100644
--- a/haproxy_3.3-dev-alpine3.22/Dockerfile
+++ b/haproxy_3.3-dev-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_3.3-dev-trixie/Dockerfile b/haproxy_3.3-dev-trixie/Dockerfile
index a7e9e2a..2ac66c6 100644
--- a/haproxy_3.3-dev-trixie/Dockerfile
+++ b/haproxy_3.3-dev-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean
 
diff --git a/haproxy_lts-alpine3.22/Dockerfile b/haproxy_lts-alpine3.22/Dockerfile
index 6744a2f..5ebc36a 100644
--- a/haproxy_lts-alpine3.22/Dockerfile
+++ b/haproxy_lts-alpine3.22/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apk add --no-cache \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	;
 
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
diff --git a/haproxy_lts-trixie/Dockerfile b/haproxy_lts-trixie/Dockerfile
index 87f3741..c2c145e 100644
--- a/haproxy_lts-trixie/Dockerfile
+++ b/haproxy_lts-trixie/Dockerfile
@@ -11,6 +11,8 @@ RUN set -eux; \
 	apt-get install --update -y --no-install-recommends \
 # @system-ca: https://github.com/docker-library/haproxy/pull/216
 		ca-certificates \
+# https://github.com/docker-library/haproxy/issues/59#issuecomment-3418639873
+		socat \
 	; \
 	apt-get dist-clean

Relevant Maintainers:

@yosifkit
yosifkit merged commit b28ef71 into docker-library:master Nov 5, 2025
19 checks passed
@yosifkit
yosifkit deleted the haproxy branch November 5, 2025 22:30
junojense pushed a commit to DDVTECH/docker-image-library that referenced this pull request Dec 3, 2025
Changes:

- docker-library/haproxy@1f56bf5: Merge pull request docker-library/haproxy#250 from infosiftr/socat
- docker-library/haproxy@3fc3329: Add `socat` to the image

Co-authored-by: Docker Library Bot <doi+docker-library-bot@docker.com>
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.

3 participants