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 #12448

Merged
merged 1 commit into from
May 18, 2022
Merged

Update haproxy #12448

merged 1 commit into from
May 18, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented May 17, 2022

Changes:

Changes:

- docker-library/haproxy@eef6393: Update 2.6-rc to 2.6-dev10
- docker-library/haproxy@2a634b8: Update 2.5 to 2.5.7
- docker-library/haproxy@c1ad6f1: Update 2.4 to 2.4.17
- docker-library/haproxy@56be0cf: Update 2.2 to 2.2.24
- docker-library/haproxy@dbe220e: Update 2.0 to 2.0.29
@github-actions
Copy link

Diff for f78a46e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4e59207..70eeab4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,24 +11,24 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 633f24fd7cddfe751c62c9490925721e087cd172
 Directory: 1.8/alpine
 
-Tags: 2.0.28, 2.0, 2.0.28-buster, 2.0-buster
+Tags: 2.0.29, 2.0, 2.0.29-buster, 2.0-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a421e7e758d512cb77364d2a1a232f3bda28c066
+GitCommit: dbe220ea2f7df73b4ac848b3b63af0ec7651cb26
 Directory: 2.0
 
-Tags: 2.0.28-alpine, 2.0-alpine, 2.0.28-alpine3.15, 2.0-alpine3.15
+Tags: 2.0.29-alpine, 2.0-alpine, 2.0.29-alpine3.15, 2.0-alpine3.15
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a421e7e758d512cb77364d2a1a232f3bda28c066
+GitCommit: dbe220ea2f7df73b4ac848b3b63af0ec7651cb26
 Directory: 2.0/alpine
 
-Tags: 2.2.23, 2.2, 2.2.23-bullseye, 2.2-bullseye
+Tags: 2.2.24, 2.2, 2.2.24-bullseye, 2.2-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 80b78bda6678279f33f46131abdf905917f6c6dc
+GitCommit: 56be0cf2562116cc7d256a9ad4687cb7611844bf
 Directory: 2.2
 
-Tags: 2.2.23-alpine, 2.2-alpine, 2.2.23-alpine3.15, 2.2-alpine3.15
+Tags: 2.2.24-alpine, 2.2-alpine, 2.2.24-alpine3.15, 2.2-alpine3.15
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 80b78bda6678279f33f46131abdf905917f6c6dc
+GitCommit: 56be0cf2562116cc7d256a9ad4687cb7611844bf
 Directory: 2.2/alpine
 
 Tags: 2.3.20, 2.3, 2.3.20-bullseye, 2.3-bullseye
@@ -41,32 +41,32 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: d0bf4675441b426432378072e248f2379784d60d
 Directory: 2.3/alpine
 
-Tags: 2.4.16, 2.4, lts, 2.4.16-bullseye, 2.4-bullseye, lts-bullseye
+Tags: 2.4.17, 2.4, lts, 2.4.17-bullseye, 2.4-bullseye, lts-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3e359a419040d46fa312296e8cd9b4edc1dedd2a
+GitCommit: c1ad6f1a7cf6cb8bc3baca2d490ce2c30ca58652
 Directory: 2.4
 
-Tags: 2.4.16-alpine, 2.4-alpine, lts-alpine, 2.4.16-alpine3.15, 2.4-alpine3.15, lts-alpine3.15
+Tags: 2.4.17-alpine, 2.4-alpine, lts-alpine, 2.4.17-alpine3.15, 2.4-alpine3.15, lts-alpine3.15
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3e359a419040d46fa312296e8cd9b4edc1dedd2a
+GitCommit: c1ad6f1a7cf6cb8bc3baca2d490ce2c30ca58652
 Directory: 2.4/alpine
 
-Tags: 2.5.6, 2.5, latest, 2.5.6-bullseye, 2.5-bullseye, bullseye
+Tags: 2.5.7, 2.5, latest, 2.5.7-bullseye, 2.5-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 337b65c7bbffcf02c8cf50c37d6837495fd32015
+GitCommit: 2a634b815ba26e961f0e63501996c7bb224a9617
 Directory: 2.5
 
-Tags: 2.5.6-alpine, 2.5-alpine, alpine, 2.5.6-alpine3.15, 2.5-alpine3.15, alpine3.15
+Tags: 2.5.7-alpine, 2.5-alpine, alpine, 2.5.7-alpine3.15, 2.5-alpine3.15, alpine3.15
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 337b65c7bbffcf02c8cf50c37d6837495fd32015
+GitCommit: 2a634b815ba26e961f0e63501996c7bb224a9617
 Directory: 2.5/alpine
 
-Tags: 2.6-dev9, 2.6-dev, 2.6-dev9-bullseye, 2.6-dev-bullseye
+Tags: 2.6-dev10, 2.6-dev, 2.6-dev10-bullseye, 2.6-dev-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0dc7b07842cc9633fc1c5d1dd212f9639cbdc6c2
+GitCommit: eef6393563cb038926e47aa06c1b4c6960cca49d
 Directory: 2.6-rc
 
-Tags: 2.6-dev9-alpine, 2.6-dev-alpine, 2.6-dev9-alpine3.15, 2.6-dev-alpine3.15
+Tags: 2.6-dev10-alpine, 2.6-dev-alpine, 2.6-dev10-alpine3.15, 2.6-dev-alpine3.15
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0dc7b07842cc9633fc1c5d1dd212f9639cbdc6c2
+GitCommit: eef6393563cb038926e47aa06c1b4c6960cca49d
 Directory: 2.6-rc/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index bcd612a..a3d726f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,18 +10,18 @@ haproxy:2.0
 haproxy:2.0-alpine
 haproxy:2.0-alpine3.15
 haproxy:2.0-buster
-haproxy:2.0.28
-haproxy:2.0.28-alpine
-haproxy:2.0.28-alpine3.15
-haproxy:2.0.28-buster
+haproxy:2.0.29
+haproxy:2.0.29-alpine
+haproxy:2.0.29-alpine3.15
+haproxy:2.0.29-buster
 haproxy:2.2
 haproxy:2.2-alpine
 haproxy:2.2-alpine3.15
 haproxy:2.2-bullseye
-haproxy:2.2.23
-haproxy:2.2.23-alpine
-haproxy:2.2.23-alpine3.15
-haproxy:2.2.23-bullseye
+haproxy:2.2.24
+haproxy:2.2.24-alpine
+haproxy:2.2.24-alpine3.15
+haproxy:2.2.24-bullseye
 haproxy:2.3
 haproxy:2.3-alpine
 haproxy:2.3-alpine3.15
@@ -34,23 +34,23 @@ haproxy:2.4
 haproxy:2.4-alpine
 haproxy:2.4-alpine3.15
 haproxy:2.4-bullseye
-haproxy:2.4.16
-haproxy:2.4.16-alpine
-haproxy:2.4.16-alpine3.15
-haproxy:2.4.16-bullseye
+haproxy:2.4.17
+haproxy:2.4.17-alpine
+haproxy:2.4.17-alpine3.15
+haproxy:2.4.17-bullseye
 haproxy:2.5
 haproxy:2.5-alpine
 haproxy:2.5-alpine3.15
 haproxy:2.5-bullseye
-haproxy:2.5.6
-haproxy:2.5.6-alpine
-haproxy:2.5.6-alpine3.15
-haproxy:2.5.6-bullseye
+haproxy:2.5.7
+haproxy:2.5.7-alpine
+haproxy:2.5.7-alpine3.15
+haproxy:2.5.7-bullseye
 haproxy:2.6-dev
-haproxy:2.6-dev9
-haproxy:2.6-dev9-alpine
-haproxy:2.6-dev9-alpine3.15
-haproxy:2.6-dev9-bullseye
+haproxy:2.6-dev10
+haproxy:2.6-dev10-alpine
+haproxy:2.6-dev10-alpine3.15
+haproxy:2.6-dev10-bullseye
 haproxy:2.6-dev-alpine
 haproxy:2.6-dev-alpine3.15
 haproxy:2.6-dev-bullseye
diff --git a/haproxy_2.0-alpine3.15/Dockerfile b/haproxy_2.0-alpine3.15/Dockerfile
index f0c5325..76d1131 100644
--- a/haproxy_2.0-alpine3.15/Dockerfile
+++ b/haproxy_2.0-alpine3.15/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.0.28
-ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.28.tar.gz
-ENV HAPROXY_SHA256 0217b3296b3f8dd0f6b918e65746f9dc8d3a276e4a3e20c66807bd6b41ef1a8b
+ENV HAPROXY_VERSION 2.0.29
+ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.29.tar.gz
+ENV HAPROXY_SHA256 39801aeede2e945aeae14e41bcbe7fe38bc63971c5d046ae11125b2da513ea5d
 
 # 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.0-buster/Dockerfile b/haproxy_2.0-buster/Dockerfile
index 26ccfd0..df554f0 100644
--- a/haproxy_2.0-buster/Dockerfile
+++ b/haproxy_2.0-buster/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.0.28
-ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.28.tar.gz
-ENV HAPROXY_SHA256 0217b3296b3f8dd0f6b918e65746f9dc8d3a276e4a3e20c66807bd6b41ef1a8b
+ENV HAPROXY_VERSION 2.0.29
+ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.29.tar.gz
+ENV HAPROXY_SHA256 39801aeede2e945aeae14e41bcbe7fe38bc63971c5d046ae11125b2da513ea5d
 
 # 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.2-alpine3.15/Dockerfile b/haproxy_2.2-alpine3.15/Dockerfile
index 1bf9fb4..f030583 100644
--- a/haproxy_2.2-alpine3.15/Dockerfile
+++ b/haproxy_2.2-alpine3.15/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.2.23
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.23.tar.gz
-ENV HAPROXY_SHA256 de573b786b66ee2ccb9a79a237b0e91d3c27a24721474f9569d5878e8eb9d4fa
+ENV HAPROXY_VERSION 2.2.24
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.24.tar.gz
+ENV HAPROXY_SHA256 0e807310dce3a5293d2454d9c1b71eb8d16472305b66f076b384b50858b1e7f9
 
 # 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.2-bullseye/Dockerfile b/haproxy_2.2-bullseye/Dockerfile
index c43dc6d..a41cf25 100644
--- a/haproxy_2.2-bullseye/Dockerfile
+++ b/haproxy_2.2-bullseye/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.2.23
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.23.tar.gz
-ENV HAPROXY_SHA256 de573b786b66ee2ccb9a79a237b0e91d3c27a24721474f9569d5878e8eb9d4fa
+ENV HAPROXY_VERSION 2.2.24
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.24.tar.gz
+ENV HAPROXY_SHA256 0e807310dce3a5293d2454d9c1b71eb8d16472305b66f076b384b50858b1e7f9
 
 # 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-dev-alpine3.15/Dockerfile b/haproxy_2.6-dev-alpine3.15/Dockerfile
index e88c3f0..63c7095 100644
--- a/haproxy_2.6-dev-alpine3.15/Dockerfile
+++ b/haproxy_2.6-dev-alpine3.15/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.6-dev9
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev9.tar.gz
-ENV HAPROXY_SHA256 8d8a068350819cb74599d14f742340bec99f16fef3fcabc157b1ba12632bc424
+ENV HAPROXY_VERSION 2.6-dev10
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev10.tar.gz
+ENV HAPROXY_SHA256 4a656123afc7bba3b04e0e8ea1326edde28e71a3f0d3b8a55c4a84994f26a0aa
 
 # 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-dev-bullseye/Dockerfile b/haproxy_2.6-dev-bullseye/Dockerfile
index 3ba0a5b..86fde82 100644
--- a/haproxy_2.6-dev-bullseye/Dockerfile
+++ b/haproxy_2.6-dev-bullseye/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.6-dev9
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev9.tar.gz
-ENV HAPROXY_SHA256 8d8a068350819cb74599d14f742340bec99f16fef3fcabc157b1ba12632bc424
+ENV HAPROXY_VERSION 2.6-dev10
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev10.tar.gz
+ENV HAPROXY_SHA256 4a656123afc7bba3b04e0e8ea1326edde28e71a3f0d3b8a55c4a84994f26a0aa
 
 # 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.15/Dockerfile b/haproxy_alpine3.15/Dockerfile
index 3988c39..97097e9 100644
--- a/haproxy_alpine3.15/Dockerfile
+++ b/haproxy_alpine3.15/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.5.6
-ENV HAPROXY_URL https://www.haproxy.org/download/2.5/src/haproxy-2.5.6.tar.gz
-ENV HAPROXY_SHA256 be4c71753f01af748531139bff3ade5450a328e7a5468c45367e021e91ec6228
+ENV HAPROXY_VERSION 2.5.7
+ENV HAPROXY_URL https://www.haproxy.org/download/2.5/src/haproxy-2.5.7.tar.gz
+ENV HAPROXY_SHA256 e29f6334c6bdb521f63ddf335e2621bd2164503b99cf1f495b6f56ff9f3c164e
 
 # 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_bullseye/Dockerfile b/haproxy_bullseye/Dockerfile
index 88c6693..9968556 100644
--- a/haproxy_bullseye/Dockerfile
+++ b/haproxy_bullseye/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.5.6
-ENV HAPROXY_URL https://www.haproxy.org/download/2.5/src/haproxy-2.5.6.tar.gz
-ENV HAPROXY_SHA256 be4c71753f01af748531139bff3ade5450a328e7a5468c45367e021e91ec6228
+ENV HAPROXY_VERSION 2.5.7
+ENV HAPROXY_URL https://www.haproxy.org/download/2.5/src/haproxy-2.5.7.tar.gz
+ENV HAPROXY_SHA256 e29f6334c6bdb521f63ddf335e2621bd2164503b99cf1f495b6f56ff9f3c164e
 
 # 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.15/Dockerfile b/haproxy_lts-alpine3.15/Dockerfile
index 5bf7e69..2f206dd 100644
--- a/haproxy_lts-alpine3.15/Dockerfile
+++ b/haproxy_lts-alpine3.15/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.4.16
-ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/haproxy-2.4.16.tar.gz
-ENV HAPROXY_SHA256 8c5533779bb8125ef8dbd56a72b1d3fd47fa6bcdf2d257d3cc001269b059cee9
+ENV HAPROXY_VERSION 2.4.17
+ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/haproxy-2.4.17.tar.gz
+ENV HAPROXY_SHA256 416ca95d51bb57eaea0d6657c06a760faa63473dca10ac6f9e68b994088d73f4
 
 # 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-bullseye/Dockerfile b/haproxy_lts-bullseye/Dockerfile
index b834555..9375ee5 100644
--- a/haproxy_lts-bullseye/Dockerfile
+++ b/haproxy_lts-bullseye/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.4.16
-ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/haproxy-2.4.16.tar.gz
-ENV HAPROXY_SHA256 8c5533779bb8125ef8dbd56a72b1d3fd47fa6bcdf2d257d3cc001269b059cee9
+ENV HAPROXY_VERSION 2.4.17
+ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/haproxy-2.4.17.tar.gz
+ENV HAPROXY_SHA256 416ca95d51bb57eaea0d6657c06a760faa63473dca10ac6f9e68b994088d73f4
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 8e7a53d into docker-library:master May 18, 2022
@yosifkit yosifkit deleted the haproxy branch May 18, 2022 00:19
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