Update haproxy #16820
Merged
Update haproxy #16820
+17
−27
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.
LaurentGoderre
previously approved these changes
May 23, 2024
Changes: - docker-library/haproxy@fa5d16b: Merge pull request docker-library/haproxy#232 from infosiftr/restore-2.0 - docker-library/haproxy@7eb71e6: Restore 2.0 (not yet EOL) - docker-library/haproxy@67485bd: Merge pull request docker-library/haproxy#231 from infosiftr/alpine3.20 - docker-library/haproxy@5804096: Update to Alpine 3.20
docker-library-bot
force-pushed
the
haproxy
branch
from
9b4f630 to
b795c34
Compare
Diff for b795c34:diff --git a/_bashbrew-arches b/_bashbrew-arches
index bedcccb..3616e93 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -6,4 +6,5 @@ arm64v8
i386
mips64le
ppc64le
+riscv64
s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index c98c6f0..1ab94f0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,32 +3,22 @@ GitRepo: https://github.com/docker-library/haproxy.git
Tags: 2.0.35, 2.0, 2.0.35-buster, 2.0-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356
+GitCommit: 7eb71e6990a7d42494707c04d3230dee3c424a82
Directory: 2.0
-Tags: 2.0.35-alpine, 2.0-alpine, 2.0.35-alpine3.16, 2.0-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ecaebdd6ebd66297882800ef9d55edfd0b52237d
-Directory: 2.0/alpine
-
Tags: 2.2.33, 2.2, 2.2.33-bullseye, 2.2-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356
Directory: 2.2
-Tags: 2.2.33-alpine, 2.2-alpine, 2.2.33-alpine3.16, 2.2-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3eaa160ca6c050f3451b7aad648f06ebc0a8bb22
-Directory: 2.2/alpine
-
Tags: 2.4.26, 2.4, 2.4.26-bookworm, 2.4-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356
Directory: 2.4
-Tags: 2.4.26-alpine, 2.4-alpine, 2.4.26-alpine3.19, 2.4-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3a8296a8e525bfff099f553cf79a46fc9ad384f2
+Tags: 2.4.26-alpine, 2.4-alpine, 2.4.26-alpine3.20, 2.4-alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 58040965047f8cc37eedbaa4d3180c6313b88440
Directory: 2.4/alpine
Tags: 2.6.17, 2.6, 2.6.17-bookworm, 2.6-bookworm
@@ -36,9 +26,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356
Directory: 2.6
-Tags: 2.6.17-alpine, 2.6-alpine, 2.6.17-alpine3.19, 2.6-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 20e1b3f92d1e74b2644f5748c62a148d07e2ca43
+Tags: 2.6.17-alpine, 2.6-alpine, 2.6.17-alpine3.20, 2.6-alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 58040965047f8cc37eedbaa4d3180c6313b88440
Directory: 2.6/alpine
Tags: 2.8.9, 2.8, lts, 2.8.9-bookworm, 2.8-bookworm, lts-bookworm
@@ -46,9 +36,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356
Directory: 2.8
-Tags: 2.8.9-alpine, 2.8-alpine, lts-alpine, 2.8.9-alpine3.19, 2.8-alpine3.19, lts-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5d34d74e22c28578cf57033f78017613ea0ced0c
+Tags: 2.8.9-alpine, 2.8-alpine, lts-alpine, 2.8.9-alpine3.20, 2.8-alpine3.20, lts-alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 58040965047f8cc37eedbaa4d3180c6313b88440
Directory: 2.8/alpine
Tags: 2.9.7, 2.9, latest, 2.9.7-bookworm, 2.9-bookworm, bookworm
@@ -56,9 +46,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356
Directory: 2.9
-Tags: 2.9.7-alpine, 2.9-alpine, alpine, 2.9.7-alpine3.19, 2.9-alpine3.19, alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 92d0a2f516f348c774861766fba6bfd87b145eca
+Tags: 2.9.7-alpine, 2.9-alpine, alpine, 2.9.7-alpine3.20, 2.9-alpine3.20, alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 58040965047f8cc37eedbaa4d3180c6313b88440
Directory: 2.9/alpine
Tags: 3.0-dev12, 3.0-dev, 3.0-dev12-bookworm, 3.0-dev-bookworm
@@ -66,7 +56,7 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 893c649e60e147302a9e466e476e60fd0880726b
Directory: 3.0
-Tags: 3.0-dev12-alpine, 3.0-dev-alpine, 3.0-dev12-alpine3.19, 3.0-dev-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 893c649e60e147302a9e466e476e60fd0880726b
+Tags: 3.0-dev12-alpine, 3.0-dev-alpine, 3.0-dev12-alpine3.20, 3.0-dev-alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 58040965047f8cc37eedbaa4d3180c6313b88440
Directory: 3.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index fb1ee5c..4200714 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,64 +1,56 @@
haproxy:2.0
-haproxy:2.0-alpine
-haproxy:2.0-alpine3.16
haproxy:2.0-buster
haproxy:2.0.35
-haproxy:2.0.35-alpine
-haproxy:2.0.35-alpine3.16
haproxy:2.0.35-buster
haproxy:2.2
-haproxy:2.2-alpine
-haproxy:2.2-alpine3.16
haproxy:2.2-bullseye
haproxy:2.2.33
-haproxy:2.2.33-alpine
-haproxy:2.2.33-alpine3.16
haproxy:2.2.33-bullseye
haproxy:2.4
haproxy:2.4-alpine
-haproxy:2.4-alpine3.19
+haproxy:2.4-alpine3.20
haproxy:2.4-bookworm
haproxy:2.4.26
haproxy:2.4.26-alpine
-haproxy:2.4.26-alpine3.19
+haproxy:2.4.26-alpine3.20
haproxy:2.4.26-bookworm
haproxy:2.6
haproxy:2.6-alpine
-haproxy:2.6-alpine3.19
+haproxy:2.6-alpine3.20
haproxy:2.6-bookworm
haproxy:2.6.17
haproxy:2.6.17-alpine
-haproxy:2.6.17-alpine3.19
+haproxy:2.6.17-alpine3.20
haproxy:2.6.17-bookworm
haproxy:2.8
haproxy:2.8-alpine
-haproxy:2.8-alpine3.19
+haproxy:2.8-alpine3.20
haproxy:2.8-bookworm
haproxy:2.8.9
haproxy:2.8.9-alpine
-haproxy:2.8.9-alpine3.19
+haproxy:2.8.9-alpine3.20
haproxy:2.8.9-bookworm
haproxy:2.9
haproxy:2.9-alpine
-haproxy:2.9-alpine3.19
+haproxy:2.9-alpine3.20
haproxy:2.9-bookworm
haproxy:2.9.7
haproxy:2.9.7-alpine
-haproxy:2.9.7-alpine3.19
+haproxy:2.9.7-alpine3.20
haproxy:2.9.7-bookworm
haproxy:3.0-dev
haproxy:3.0-dev12
haproxy:3.0-dev12-alpine
-haproxy:3.0-dev12-alpine3.19
+haproxy:3.0-dev12-alpine3.20
haproxy:3.0-dev12-bookworm
haproxy:3.0-dev-alpine
-haproxy:3.0-dev-alpine3.19
+haproxy:3.0-dev-alpine3.20
haproxy:3.0-dev-bookworm
haproxy:alpine
-haproxy:alpine3.19
+haproxy:alpine3.20
haproxy:bookworm
haproxy:latest
haproxy:lts
haproxy:lts-alpine
-haproxy:lts-alpine3.19
+haproxy:lts-alpine3.20
haproxy:lts-bookworm
diff --git a/haproxy_2.0-alpine3.16/Dockerfile b/haproxy_2.0-alpine3.16/Dockerfile
deleted file mode 100644
index 2b487fc..0000000
diff --git a/haproxy_2.2-alpine3.16/Dockerfile b/haproxy_2.2-alpine3.16/Dockerfile
deleted file mode 100644
index 889a172..0000000
diff --git a/haproxy_2.4-alpine3.19/Dockerfile b/haproxy_2.4-alpine3.20/Dockerfile
similarity index 99%
rename from haproxy_2.4-alpine3.19/Dockerfile
rename to haproxy_2.4-alpine3.20/Dockerfile
index a10a614..a5dd0be 100644
--- a/haproxy_2.4-alpine3.19/Dockerfile
+++ b/haproxy_2.4-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# runtime dependencies
RUN set -eux; \
diff --git a/haproxy_2.0-alpine3.16/docker-entrypoint.sh b/haproxy_2.4-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.0-alpine3.16/docker-entrypoint.sh
rename to haproxy_2.4-alpine3.20/docker-entrypoint.sh
diff --git a/haproxy_2.6-alpine3.19/Dockerfile b/haproxy_2.6-alpine3.20/Dockerfile
similarity index 99%
rename from haproxy_2.6-alpine3.19/Dockerfile
rename to haproxy_2.6-alpine3.20/Dockerfile
index c6ca86b..66f416a 100644
--- a/haproxy_2.6-alpine3.19/Dockerfile
+++ b/haproxy_2.6-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# runtime dependencies
RUN set -eux; \
diff --git a/haproxy_2.2-alpine3.16/docker-entrypoint.sh b/haproxy_2.6-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.2-alpine3.16/docker-entrypoint.sh
rename to haproxy_2.6-alpine3.20/docker-entrypoint.sh
diff --git a/haproxy_3.0-dev-alpine3.19/Dockerfile b/haproxy_3.0-dev-alpine3.20/Dockerfile
similarity index 99%
rename from haproxy_3.0-dev-alpine3.19/Dockerfile
rename to haproxy_3.0-dev-alpine3.20/Dockerfile
index f58f0c8..963f7e4 100644
--- a/haproxy_3.0-dev-alpine3.19/Dockerfile
+++ b/haproxy_3.0-dev-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# runtime dependencies
RUN set -eux; \
diff --git a/haproxy_2.4-alpine3.19/docker-entrypoint.sh b/haproxy_3.0-dev-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.4-alpine3.19/docker-entrypoint.sh
rename to haproxy_3.0-dev-alpine3.20/docker-entrypoint.sh
diff --git a/haproxy_alpine3.19/docker-entrypoint.sh b/haproxy_alpine3.19/docker-entrypoint.sh
deleted file mode 100755
index 8b2093b..0000000
diff --git a/haproxy_alpine3.19/Dockerfile b/haproxy_alpine3.20/Dockerfile
similarity index 99%
rename from haproxy_alpine3.19/Dockerfile
rename to haproxy_alpine3.20/Dockerfile
index b2c52f7..fa69e99 100644
--- a/haproxy_alpine3.19/Dockerfile
+++ b/haproxy_alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# runtime dependencies
RUN set -eux; \
diff --git a/haproxy_2.6-alpine3.19/docker-entrypoint.sh b/haproxy_alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.6-alpine3.19/docker-entrypoint.sh
rename to haproxy_alpine3.20/docker-entrypoint.sh
diff --git a/haproxy_lts-alpine3.19/docker-entrypoint.sh b/haproxy_lts-alpine3.19/docker-entrypoint.sh
deleted file mode 100755
index 8b2093b..0000000
diff --git a/haproxy_lts-alpine3.19/Dockerfile b/haproxy_lts-alpine3.20/Dockerfile
similarity index 99%
rename from haproxy_lts-alpine3.19/Dockerfile
rename to haproxy_lts-alpine3.20/Dockerfile
index 9445918..fb9b2e0 100644
--- a/haproxy_lts-alpine3.19/Dockerfile
+++ b/haproxy_lts-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.20
# runtime dependencies
RUN set -eux; \
diff --git a/haproxy_3.0-dev-alpine3.19/docker-entrypoint.sh b/haproxy_lts-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.0-dev-alpine3.19/docker-entrypoint.sh
rename to haproxy_lts-alpine3.20/docker-entrypoint.shRelevant Maintainers: |
yosifkit
approved these changes
May 24, 2024
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: