Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update haproxy #18337

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Update haproxy #18337

merged 1 commit into from
Jan 29, 2025

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/haproxy@9172eda: Update 3.1 to 3.1.3
- docker-library/haproxy@262506a: Update 3.0 to 3.0.8
- docker-library/haproxy@812c877: Update 2.9 to 2.9.14
- docker-library/haproxy@c491c7f: Update 2.8 to 2.8.14
- docker-library/haproxy@1d0ad8c: Update 2.6 to 2.6.21
@yosifkit yosifkit requested a review from a team as a code owner January 29, 2025 22:48
Copy link

Diff for 93cfeaf:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a85e260..4185117 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,54 +16,54 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 2.4/alpine
 
-Tags: 2.6.20, 2.6, 2.6.20-bookworm, 2.6-bookworm
+Tags: 2.6.21, 2.6, 2.6.21-bookworm, 2.6-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a0cdd805ad2cccf3400fb99dd18d0f49579d1cf4
+GitCommit: 1d0ad8c9e8dd1b976f8cc81b263f18bcfc1d9be2
 Directory: 2.6
 
-Tags: 2.6.20-alpine, 2.6-alpine, 2.6.20-alpine3.21, 2.6-alpine3.21
+Tags: 2.6.21-alpine, 2.6-alpine, 2.6.21-alpine3.21, 2.6-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
+GitCommit: 1d0ad8c9e8dd1b976f8cc81b263f18bcfc1d9be2
 Directory: 2.6/alpine
 
-Tags: 2.8.13, 2.8, 2.8.13-bookworm, 2.8-bookworm
+Tags: 2.8.14, 2.8, 2.8.14-bookworm, 2.8-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ff4e3ce324778f1c2b65d6d61ddbf00c0b51793b
+GitCommit: c491c7f23708215e6f6d3e6cc9339acfda331821
 Directory: 2.8
 
-Tags: 2.8.13-alpine, 2.8-alpine, 2.8.13-alpine3.21, 2.8-alpine3.21
+Tags: 2.8.14-alpine, 2.8-alpine, 2.8.14-alpine3.21, 2.8-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
+GitCommit: c491c7f23708215e6f6d3e6cc9339acfda331821
 Directory: 2.8/alpine
 
-Tags: 2.9.13, 2.9, 2.9.13-bookworm, 2.9-bookworm
+Tags: 2.9.14, 2.9, 2.9.14-bookworm, 2.9-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0c1da312a638ecef78b17c6919ec9780bc1f75e9
+GitCommit: 812c8779de1250bb2e3e2c7da0a4b543ccc49edb
 Directory: 2.9
 
-Tags: 2.9.13-alpine, 2.9-alpine, 2.9.13-alpine3.21, 2.9-alpine3.21
+Tags: 2.9.14-alpine, 2.9-alpine, 2.9.14-alpine3.21, 2.9-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
+GitCommit: 812c8779de1250bb2e3e2c7da0a4b543ccc49edb
 Directory: 2.9/alpine
 
-Tags: 3.0.7, 3.0, lts, 3.0.7-bookworm, 3.0-bookworm, lts-bookworm
+Tags: 3.0.8, 3.0, lts, 3.0.8-bookworm, 3.0-bookworm, lts-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f0dc84e9e09aa9aa758e6f9340ee0ab3b440930d
+GitCommit: 262506addcf26d79cf3983d5556b835d5818ee63
 Directory: 3.0
 
-Tags: 3.0.7-alpine, 3.0-alpine, lts-alpine, 3.0.7-alpine3.21, 3.0-alpine3.21, lts-alpine3.21
+Tags: 3.0.8-alpine, 3.0-alpine, lts-alpine, 3.0.8-alpine3.21, 3.0-alpine3.21, lts-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
+GitCommit: 262506addcf26d79cf3983d5556b835d5818ee63
 Directory: 3.0/alpine
 
-Tags: 3.1.2, 3.1, latest, 3.1.2-bookworm, 3.1-bookworm, bookworm
+Tags: 3.1.3, 3.1, latest, 3.1.3-bookworm, 3.1-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 116ca50708ff505ac73b7c8dcc6d7689151946bb
+GitCommit: 9172eda0839755b609790ff159545e1f7d66d9b1
 Directory: 3.1
 
-Tags: 3.1.2-alpine, 3.1-alpine, alpine, 3.1.2-alpine3.21, 3.1-alpine3.21, alpine3.21
+Tags: 3.1.3-alpine, 3.1-alpine, alpine, 3.1.3-alpine3.21, 3.1-alpine3.21, alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 116ca50708ff505ac73b7c8dcc6d7689151946bb
+GitCommit: 9172eda0839755b609790ff159545e1f7d66d9b1
 Directory: 3.1/alpine
 
 Tags: 3.2-dev4, 3.2-dev, 3.2-dev4-bookworm, 3.2-dev-bookworm
diff --git a/_bashbrew-list b/_bashbrew-list
index b93c20a..946e3be 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,42 +14,42 @@ haproxy:2.6
 haproxy:2.6-alpine
 haproxy:2.6-alpine3.21
 haproxy:2.6-bookworm
-haproxy:2.6.20
-haproxy:2.6.20-alpine
-haproxy:2.6.20-alpine3.21
-haproxy:2.6.20-bookworm
+haproxy:2.6.21
+haproxy:2.6.21-alpine
+haproxy:2.6.21-alpine3.21
+haproxy:2.6.21-bookworm
 haproxy:2.8
 haproxy:2.8-alpine
 haproxy:2.8-alpine3.21
 haproxy:2.8-bookworm
-haproxy:2.8.13
-haproxy:2.8.13-alpine
-haproxy:2.8.13-alpine3.21
-haproxy:2.8.13-bookworm
+haproxy:2.8.14
+haproxy:2.8.14-alpine
+haproxy:2.8.14-alpine3.21
+haproxy:2.8.14-bookworm
 haproxy:2.9
 haproxy:2.9-alpine
 haproxy:2.9-alpine3.21
 haproxy:2.9-bookworm
-haproxy:2.9.13
-haproxy:2.9.13-alpine
-haproxy:2.9.13-alpine3.21
-haproxy:2.9.13-bookworm
+haproxy:2.9.14
+haproxy:2.9.14-alpine
+haproxy:2.9.14-alpine3.21
+haproxy:2.9.14-bookworm
 haproxy:3.0
 haproxy:3.0-alpine
 haproxy:3.0-alpine3.21
 haproxy:3.0-bookworm
-haproxy:3.0.7
-haproxy:3.0.7-alpine
-haproxy:3.0.7-alpine3.21
-haproxy:3.0.7-bookworm
+haproxy:3.0.8
+haproxy:3.0.8-alpine
+haproxy:3.0.8-alpine3.21
+haproxy:3.0.8-bookworm
 haproxy:3.1
 haproxy:3.1-alpine
 haproxy:3.1-alpine3.21
 haproxy:3.1-bookworm
-haproxy:3.1.2
-haproxy:3.1.2-alpine
-haproxy:3.1.2-alpine3.21
-haproxy:3.1.2-bookworm
+haproxy:3.1.3
+haproxy:3.1.3-alpine
+haproxy:3.1.3-alpine3.21
+haproxy:3.1.3-bookworm
 haproxy:3.2-dev
 haproxy:3.2-dev4
 haproxy:3.2-dev4-alpine
diff --git a/haproxy_2.6-alpine3.21/Dockerfile b/haproxy_2.6-alpine3.21/Dockerfile
index fa92f8a..6f12971 100644
--- a/haproxy_2.6-alpine3.21/Dockerfile
+++ b/haproxy_2.6-alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.6.20
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.20.tar.gz
-ENV HAPROXY_SHA256 ef8c397a37fec4f7df1cfadc2c90f19f4cc2e4163ae7457c7b052da9f5a17a69
+ENV HAPROXY_VERSION 2.6.21
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.21.tar.gz
+ENV HAPROXY_SHA256 b905898bf762adbde180a866dbae2e39a4a377767cf3dd08694be9e56e876274
 
 # 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.6-bookworm/Dockerfile b/haproxy_2.6-bookworm/Dockerfile
index ab917ea..4b73782 100644
--- a/haproxy_2.6-bookworm/Dockerfile
+++ b/haproxy_2.6-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.6.20
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.20.tar.gz
-ENV HAPROXY_SHA256 ef8c397a37fec4f7df1cfadc2c90f19f4cc2e4163ae7457c7b052da9f5a17a69
+ENV HAPROXY_VERSION 2.6.21
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.21.tar.gz
+ENV HAPROXY_SHA256 b905898bf762adbde180a866dbae2e39a4a377767cf3dd08694be9e56e876274
 
 # 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.8-alpine3.21/Dockerfile b/haproxy_2.8-alpine3.21/Dockerfile
index 33594de..3bafad3 100644
--- a/haproxy_2.8-alpine3.21/Dockerfile
+++ b/haproxy_2.8-alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.8.13
-ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.13.tar.gz
-ENV HAPROXY_SHA256 13dc06a65b7705b94c843bda8b845edbb621bf45e8a9dc7db590d40ab920a9ce
+ENV HAPROXY_VERSION 2.8.14
+ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.14.tar.gz
+ENV HAPROXY_SHA256 47984506d0cd477d5c6a7d7ba2adaf0039ca27af970bf76384855a7f1c22773c
 
 # 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.8-bookworm/Dockerfile b/haproxy_2.8-bookworm/Dockerfile
index 6b7a871..01d5314 100644
--- a/haproxy_2.8-bookworm/Dockerfile
+++ b/haproxy_2.8-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.8.13
-ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.13.tar.gz
-ENV HAPROXY_SHA256 13dc06a65b7705b94c843bda8b845edbb621bf45e8a9dc7db590d40ab920a9ce
+ENV HAPROXY_VERSION 2.8.14
+ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.14.tar.gz
+ENV HAPROXY_SHA256 47984506d0cd477d5c6a7d7ba2adaf0039ca27af970bf76384855a7f1c22773c
 
 # 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.9-alpine3.21/Dockerfile b/haproxy_2.9-alpine3.21/Dockerfile
index ab5265e..ecb4f53 100644
--- a/haproxy_2.9-alpine3.21/Dockerfile
+++ b/haproxy_2.9-alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.9.13
-ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/haproxy-2.9.13.tar.gz
-ENV HAPROXY_SHA256 77d73e6bcda4863855442fe0d8f8dda12323043eeb49d0b3763f0b7314b05a93
+ENV HAPROXY_VERSION 2.9.14
+ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/haproxy-2.9.14.tar.gz
+ENV HAPROXY_SHA256 f4481c40f23d5ebfb7c182f07d3631c28dce4702ebe2f9bffe460585a2df6a7b
 
 # 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.9-bookworm/Dockerfile b/haproxy_2.9-bookworm/Dockerfile
index 2f1ea5c..4f9e6f1 100644
--- a/haproxy_2.9-bookworm/Dockerfile
+++ b/haproxy_2.9-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.9.13
-ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/haproxy-2.9.13.tar.gz
-ENV HAPROXY_SHA256 77d73e6bcda4863855442fe0d8f8dda12323043eeb49d0b3763f0b7314b05a93
+ENV HAPROXY_VERSION 2.9.14
+ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/haproxy-2.9.14.tar.gz
+ENV HAPROXY_SHA256 f4481c40f23d5ebfb7c182f07d3631c28dce4702ebe2f9bffe460585a2df6a7b
 
 # 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_alpine3.21/Dockerfile b/haproxy_alpine3.21/Dockerfile
index 63e6762..a428e14 100644
--- a/haproxy_alpine3.21/Dockerfile
+++ b/haproxy_alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.1.2
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.2.tar.gz
-ENV HAPROXY_SHA256 af35dc8bf3193870b72276a63920974bef1405fc41038d545b86b641aa59f400
+ENV HAPROXY_VERSION 3.1.3
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.3.tar.gz
+ENV HAPROXY_SHA256 6dd21f9a41f0ec7289650e299180b64f9dd225e35113fd1bddc6a3a2e79d5172
 
 # 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_bookworm/Dockerfile b/haproxy_bookworm/Dockerfile
index 0c1e391..a57bed8 100644
--- a/haproxy_bookworm/Dockerfile
+++ b/haproxy_bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.1.2
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.2.tar.gz
-ENV HAPROXY_SHA256 af35dc8bf3193870b72276a63920974bef1405fc41038d545b86b641aa59f400
+ENV HAPROXY_VERSION 3.1.3
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.3.tar.gz
+ENV HAPROXY_SHA256 6dd21f9a41f0ec7289650e299180b64f9dd225e35113fd1bddc6a3a2e79d5172
 
 # 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-alpine3.21/Dockerfile b/haproxy_lts-alpine3.21/Dockerfile
index c91941b..011f89b 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.7
-ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/haproxy-3.0.7.tar.gz
-ENV HAPROXY_SHA256 5c5c6b66645278435a89cd6e2a0d39f8e7d2546212d847bd0d236511ff996f11
+ENV HAPROXY_VERSION 3.0.8
+ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/haproxy-3.0.8.tar.gz
+ENV HAPROXY_SHA256 930ae2c33058e1f497fe62cdaacffab6cab6a91e31ba011a9a2f9fe6c5c4aebc
 
 # 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 47737ed..b0a4eda 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.7
-ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/haproxy-3.0.7.tar.gz
-ENV HAPROXY_SHA256 5c5c6b66645278435a89cd6e2a0d39f8e7d2546212d847bd0d236511ff996f11
+ENV HAPROXY_VERSION 3.0.8
+ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/haproxy-3.0.8.tar.gz
+ENV HAPROXY_SHA256 930ae2c33058e1f497fe62cdaacffab6cab6a91e31ba011a9a2f9fe6c5c4aebc
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \

Relevant Maintainers:

@tianon tianon merged commit 9ac847a into docker-library:master Jan 29, 2025
20 checks passed
@tianon tianon deleted the haproxy branch January 29, 2025 22:53
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