Update haproxy #15842
Merged
Update haproxy #15842
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
Changes: - docker-library/haproxy@c5aae27: Merge pull request docker-library/haproxy#222 from TimWolla/haproxy-3.0 - docker-library/haproxy@e3fc1f8: Add HAProxy 3.0 - docker-library/haproxy@81e9df2: Update "latest" for 2.9 GA - docker-library/haproxy@a2cdec0: Update 2.9 to 2.9.0
docker-library-bot
force-pushed
the
haproxy
branch
from
8a31f9a to
cfa1c22
Compare
Diff for cfa1c22:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2203d40..74da8b9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -51,22 +51,32 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 6ac34139426d79e07ec76ff9a8b9948dc85e34b3
Directory: 2.7/alpine
-Tags: 2.8.4, 2.8, lts, latest, 2.8.4-bullseye, 2.8-bullseye, lts-bullseye, bullseye
+Tags: 2.8.4, 2.8, lts, 2.8.4-bullseye, 2.8-bullseye, lts-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 3b21ae1e4abb804305fcda315a390ef27f8e2caa
Directory: 2.8
-Tags: 2.8.4-alpine, 2.8-alpine, lts-alpine, alpine, 2.8.4-alpine3.18, 2.8-alpine3.18, lts-alpine3.18, alpine3.18
+Tags: 2.8.4-alpine, 2.8-alpine, lts-alpine, 2.8.4-alpine3.18, 2.8-alpine3.18, lts-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 3b21ae1e4abb804305fcda315a390ef27f8e2caa
Directory: 2.8/alpine
-Tags: 2.9-dev12, 2.9-dev, 2.9-dev12-bullseye, 2.9-dev-bullseye
+Tags: 2.9.0, 2.9, latest, 2.9.0-bullseye, 2.9-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f7d1d26511f3cf69eee01dbbea741130e2a2f8c3
+GitCommit: a2cdec0b128a2c128a6e81c93b67ec502b2131f3
Directory: 2.9
-Tags: 2.9-dev12-alpine, 2.9-dev-alpine, 2.9-dev12-alpine3.18, 2.9-dev-alpine3.18
+Tags: 2.9.0-alpine, 2.9-alpine, alpine, 2.9.0-alpine3.18, 2.9-alpine3.18, alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f7d1d26511f3cf69eee01dbbea741130e2a2f8c3
+GitCommit: a2cdec0b128a2c128a6e81c93b67ec502b2131f3
Directory: 2.9/alpine
+
+Tags: 3.0-dev0, 3.0-dev, 3.0-dev0-bullseye, 3.0-dev-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: e3fc1f8a671d2362e20ce2895fe284bef3934926
+Directory: 3.0
+
+Tags: 3.0-dev0-alpine, 3.0-dev-alpine, 3.0-dev0-alpine3.18, 3.0-dev-alpine3.18
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: e3fc1f8a671d2362e20ce2895fe284bef3934926
+Directory: 3.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index e9516ca..74f43f4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,14 +46,21 @@ haproxy:2.8.4
haproxy:2.8.4-alpine
haproxy:2.8.4-alpine3.18
haproxy:2.8.4-bullseye
-haproxy:2.9-dev
-haproxy:2.9-dev12
-haproxy:2.9-dev12-alpine
-haproxy:2.9-dev12-alpine3.18
-haproxy:2.9-dev12-bullseye
-haproxy:2.9-dev-alpine
-haproxy:2.9-dev-alpine3.18
-haproxy:2.9-dev-bullseye
+haproxy:2.9
+haproxy:2.9-alpine
+haproxy:2.9-alpine3.18
+haproxy:2.9-bullseye
+haproxy:2.9.0
+haproxy:2.9.0-alpine
+haproxy:2.9.0-alpine3.18
+haproxy:2.9.0-bullseye
+haproxy:3.0-dev0
+haproxy:3.0-dev0-alpine
+haproxy:3.0-dev0-alpine3.18
+haproxy:3.0-dev0-bullseye
+haproxy:3.0-dev-alpine
+haproxy:3.0-dev-alpine3.18
+haproxy:3.0-dev-bullseye
haproxy:alpine
haproxy:alpine3.18
haproxy:bullseye
diff --git a/haproxy_2.9-dev-alpine3.18/Dockerfile b/haproxy_3.0-dev-alpine3.18/Dockerfile
similarity index 92%
rename from haproxy_2.9-dev-alpine3.18/Dockerfile
rename to haproxy_3.0-dev-alpine3.18/Dockerfile
index dbc6839..93707bd 100644
--- a/haproxy_2.9-dev-alpine3.18/Dockerfile
+++ b/haproxy_3.0-dev-alpine3.18/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.9-dev12
-ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/devel/haproxy-2.9-dev12.tar.gz
-ENV HAPROXY_SHA256 74adb6c44a69ca09fa4bda165172aec34e0023a8491ab33418cf7fd3c28c3007
+ENV HAPROXY_VERSION 3.0-dev0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/devel/haproxy-3.0-dev0.tar.gz
+ENV HAPROXY_SHA256 47c387d203ab00b5501017691f741375359a161216a84b17e55e48f2e84adc9f
# 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-dev-alpine3.18/docker-entrypoint.sh b/haproxy_3.0-dev-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.9-dev-alpine3.18/docker-entrypoint.sh
rename to haproxy_3.0-dev-alpine3.18/docker-entrypoint.sh
diff --git a/haproxy_2.9-dev-bullseye/Dockerfile b/haproxy_3.0-dev-bullseye/Dockerfile
similarity index 93%
rename from haproxy_2.9-dev-bullseye/Dockerfile
rename to haproxy_3.0-dev-bullseye/Dockerfile
index 969cc11..5c9ae9e 100644
--- a/haproxy_2.9-dev-bullseye/Dockerfile
+++ b/haproxy_3.0-dev-bullseye/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.9-dev12
-ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/devel/haproxy-2.9-dev12.tar.gz
-ENV HAPROXY_SHA256 74adb6c44a69ca09fa4bda165172aec34e0023a8491ab33418cf7fd3c28c3007
+ENV HAPROXY_VERSION 3.0-dev0
+ENV HAPROXY_URL https://www.haproxy.org/download/3.0/src/devel/haproxy-3.0-dev0.tar.gz
+ENV HAPROXY_SHA256 47c387d203ab00b5501017691f741375359a161216a84b17e55e48f2e84adc9f
# 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-dev-bullseye/docker-entrypoint.sh b/haproxy_3.0-dev-bullseye/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.9-dev-bullseye/docker-entrypoint.sh
rename to haproxy_3.0-dev-bullseye/docker-entrypoint.sh
diff --git a/haproxy_alpine3.18/Dockerfile b/haproxy_alpine3.18/Dockerfile
index e2cbc72..5c4ea5e 100644
--- a/haproxy_alpine3.18/Dockerfile
+++ b/haproxy_alpine3.18/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.8.4
-ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.4.tar.gz
-ENV HAPROXY_SHA256 81bacbf50ec6d0f7ecaaad7c03e59978b00322fbdad6ed4a989dd31754b6f25d
+ENV HAPROXY_VERSION 2.9.0
+ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/haproxy-2.9.0.tar.gz
+ENV HAPROXY_SHA256 fba18acd1a46337fe20ae07c816c2496c8602b80a1bc9ff3768d4caa5fb80eab
# 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 f981f2c..baf9d24 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.8.4
-ENV HAPROXY_URL https://www.haproxy.org/download/2.8/src/haproxy-2.8.4.tar.gz
-ENV HAPROXY_SHA256 81bacbf50ec6d0f7ecaaad7c03e59978b00322fbdad6ed4a989dd31754b6f25d
+ENV HAPROXY_VERSION 2.9.0
+ENV HAPROXY_URL https://www.haproxy.org/download/2.9/src/haproxy-2.9.0.tar.gz
+ENV HAPROXY_SHA256 fba18acd1a46337fe20ae07c816c2496c8602b80a1bc9ff3768d4caa5fb80eab
# 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.18/Dockerfile b/haproxy_lts-alpine3.18/Dockerfile
similarity index 100%
copy from haproxy_alpine3.18/Dockerfile
copy to haproxy_lts-alpine3.18/Dockerfile
diff --git a/haproxy_2.0-alpine3.16/docker-entrypoint.sh b/haproxy_lts-alpine3.18/docker-entrypoint.sh
similarity index 100%
copy from haproxy_2.0-alpine3.16/docker-entrypoint.sh
copy to haproxy_lts-alpine3.18/docker-entrypoint.sh
diff --git a/haproxy_bullseye/Dockerfile b/haproxy_lts-bullseye/Dockerfile
similarity index 100%
copy from haproxy_bullseye/Dockerfile
copy to haproxy_lts-bullseye/Dockerfile
diff --git a/haproxy_2.0-alpine3.16/docker-entrypoint.sh b/haproxy_lts-bullseye/docker-entrypoint.sh
similarity index 100%
copy from haproxy_2.0-alpine3.16/docker-entrypoint.sh
copy to haproxy_lts-bullseye/docker-entrypoint.shRelevant Maintainers: |
yosifkit
approved these changes
Dec 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: