-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #15888
Merged
Merged
Update haproxy #15888
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
Changes: - docker-library/haproxy@54990d4: Merge pull request docker-library/haproxy#223 from J0WI/alpine-3.19 - docker-library/haproxy@4df9df8: Alpine 3.19
Diff for 4c16f18:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ea478c2..7c17f04 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,9 +16,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: ad34487167b0bb727cb56000f26d8ea37449c590
Directory: 2.2
-Tags: 2.2.31-alpine, 2.2-alpine, 2.2.31-alpine3.18, 2.2-alpine3.18
+Tags: 2.2.31-alpine, 2.2-alpine, 2.2.31-alpine3.19, 2.2-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ad34487167b0bb727cb56000f26d8ea37449c590
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.2/alpine
Tags: 2.4.24, 2.4, 2.4.24-bullseye, 2.4-bullseye
@@ -26,9 +26,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 4c041fe042121e9f30046440f12cf0d2747a5061
Directory: 2.4
-Tags: 2.4.24-alpine, 2.4-alpine, 2.4.24-alpine3.18, 2.4-alpine3.18
+Tags: 2.4.24-alpine, 2.4-alpine, 2.4.24-alpine3.19, 2.4-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4c041fe042121e9f30046440f12cf0d2747a5061
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.4/alpine
Tags: 2.6.15, 2.6, 2.6.15-bullseye, 2.6-bullseye
@@ -36,9 +36,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: fc50ce81390257a9702f3ea74237a73c658a1789
Directory: 2.6
-Tags: 2.6.15-alpine, 2.6-alpine, 2.6.15-alpine3.18, 2.6-alpine3.18
+Tags: 2.6.15-alpine, 2.6-alpine, 2.6.15-alpine3.19, 2.6-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fc50ce81390257a9702f3ea74237a73c658a1789
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.6/alpine
Tags: 2.7.11, 2.7, 2.7.11-bullseye, 2.7-bullseye
@@ -46,9 +46,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 68e4a3bbf0ff9acbdba492321b63c2bfdf9f9e22
Directory: 2.7
-Tags: 2.7.11-alpine, 2.7-alpine, 2.7.11-alpine3.18, 2.7-alpine3.18
+Tags: 2.7.11-alpine, 2.7-alpine, 2.7.11-alpine3.19, 2.7-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 68e4a3bbf0ff9acbdba492321b63c2bfdf9f9e22
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.7/alpine
Tags: 2.8.5, 2.8, lts, 2.8.5-bullseye, 2.8-bullseye, lts-bullseye
@@ -56,9 +56,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: a287ce7a211b83adb90b1b3bd97d534c0520be8a
Directory: 2.8
-Tags: 2.8.5-alpine, 2.8-alpine, lts-alpine, 2.8.5-alpine3.18, 2.8-alpine3.18, lts-alpine3.18
+Tags: 2.8.5-alpine, 2.8-alpine, lts-alpine, 2.8.5-alpine3.19, 2.8-alpine3.19, lts-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a287ce7a211b83adb90b1b3bd97d534c0520be8a
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.8/alpine
Tags: 2.9.0, 2.9, latest, 2.9.0-bullseye, 2.9-bullseye, bullseye
@@ -66,9 +66,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: a2cdec0b128a2c128a6e81c93b67ec502b2131f3
Directory: 2.9
-Tags: 2.9.0-alpine, 2.9-alpine, alpine, 2.9.0-alpine3.18, 2.9-alpine3.18, alpine3.18
+Tags: 2.9.0-alpine, 2.9-alpine, alpine, 2.9.0-alpine3.19, 2.9-alpine3.19, alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a2cdec0b128a2c128a6e81c93b67ec502b2131f3
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.9/alpine
Tags: 3.0-dev0, 3.0-dev, 3.0-dev0-bullseye, 3.0-dev-bullseye
@@ -76,7 +76,7 @@ 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
+Tags: 3.0-dev0-alpine, 3.0-dev-alpine, 3.0-dev0-alpine3.19, 3.0-dev-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e3fc1f8a671d2362e20ce2895fe284bef3934926
+GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 3.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 1293427..fe41880 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,64 +8,64 @@ haproxy:2.0.33-alpine3.16
haproxy:2.0.33-buster
haproxy:2.2
haproxy:2.2-alpine
-haproxy:2.2-alpine3.18
+haproxy:2.2-alpine3.19
haproxy:2.2-bullseye
haproxy:2.2.31
haproxy:2.2.31-alpine
-haproxy:2.2.31-alpine3.18
+haproxy:2.2.31-alpine3.19
haproxy:2.2.31-bullseye
haproxy:2.4
haproxy:2.4-alpine
-haproxy:2.4-alpine3.18
+haproxy:2.4-alpine3.19
haproxy:2.4-bullseye
haproxy:2.4.24
haproxy:2.4.24-alpine
-haproxy:2.4.24-alpine3.18
+haproxy:2.4.24-alpine3.19
haproxy:2.4.24-bullseye
haproxy:2.6
haproxy:2.6-alpine
-haproxy:2.6-alpine3.18
+haproxy:2.6-alpine3.19
haproxy:2.6-bullseye
haproxy:2.6.15
haproxy:2.6.15-alpine
-haproxy:2.6.15-alpine3.18
+haproxy:2.6.15-alpine3.19
haproxy:2.6.15-bullseye
haproxy:2.7
haproxy:2.7-alpine
-haproxy:2.7-alpine3.18
+haproxy:2.7-alpine3.19
haproxy:2.7-bullseye
haproxy:2.7.11
haproxy:2.7.11-alpine
-haproxy:2.7.11-alpine3.18
+haproxy:2.7.11-alpine3.19
haproxy:2.7.11-bullseye
haproxy:2.8
haproxy:2.8-alpine
-haproxy:2.8-alpine3.18
+haproxy:2.8-alpine3.19
haproxy:2.8-bullseye
haproxy:2.8.5
haproxy:2.8.5-alpine
-haproxy:2.8.5-alpine3.18
+haproxy:2.8.5-alpine3.19
haproxy:2.8.5-bullseye
haproxy:2.9
haproxy:2.9-alpine
-haproxy:2.9-alpine3.18
+haproxy:2.9-alpine3.19
haproxy:2.9-bullseye
haproxy:2.9.0
haproxy:2.9.0-alpine
-haproxy:2.9.0-alpine3.18
+haproxy:2.9.0-alpine3.19
haproxy:2.9.0-bullseye
haproxy:3.0-dev0
haproxy:3.0-dev0-alpine
-haproxy:3.0-dev0-alpine3.18
+haproxy:3.0-dev0-alpine3.19
haproxy:3.0-dev0-bullseye
haproxy:3.0-dev-alpine
-haproxy:3.0-dev-alpine3.18
+haproxy:3.0-dev-alpine3.19
haproxy:3.0-dev-bullseye
haproxy:alpine
-haproxy:alpine3.18
+haproxy:alpine3.19
haproxy:bullseye
haproxy:latest
haproxy:lts
haproxy:lts-alpine
-haproxy:lts-alpine3.18
+haproxy:lts-alpine3.19
haproxy:lts-bullseye
diff --git a/haproxy_2.2-alpine3.18/Dockerfile b/haproxy_2.2-alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_2.2-alpine3.18/Dockerfile
rename to haproxy_2.2-alpine3.19/Dockerfile
index f3d8082..8ef2113 100644
--- a/haproxy_2.2-alpine3.18/Dockerfile
+++ b/haproxy_2.2-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_2.2-alpine3.18/docker-entrypoint.sh b/haproxy_2.2-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.2-alpine3.18/docker-entrypoint.sh
rename to haproxy_2.2-alpine3.19/docker-entrypoint.sh
diff --git a/haproxy_2.4-alpine3.18/Dockerfile b/haproxy_2.4-alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_2.4-alpine3.18/Dockerfile
rename to haproxy_2.4-alpine3.19/Dockerfile
index 02d68e9..edb9400 100644
--- a/haproxy_2.4-alpine3.18/Dockerfile
+++ b/haproxy_2.4-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_2.4-alpine3.18/docker-entrypoint.sh b/haproxy_2.4-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.4-alpine3.18/docker-entrypoint.sh
rename to haproxy_2.4-alpine3.19/docker-entrypoint.sh
diff --git a/haproxy_2.6-alpine3.18/Dockerfile b/haproxy_2.6-alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_2.6-alpine3.18/Dockerfile
rename to haproxy_2.6-alpine3.19/Dockerfile
index f4c30bc..00b3da7 100644
--- a/haproxy_2.6-alpine3.18/Dockerfile
+++ b/haproxy_2.6-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_2.6-alpine3.18/docker-entrypoint.sh b/haproxy_2.6-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.6-alpine3.18/docker-entrypoint.sh
rename to haproxy_2.6-alpine3.19/docker-entrypoint.sh
diff --git a/haproxy_2.7-alpine3.18/Dockerfile b/haproxy_2.7-alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_2.7-alpine3.18/Dockerfile
rename to haproxy_2.7-alpine3.19/Dockerfile
index 321f208..7cadd4f 100644
--- a/haproxy_2.7-alpine3.18/Dockerfile
+++ b/haproxy_2.7-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_2.7-alpine3.18/docker-entrypoint.sh b/haproxy_2.7-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.7-alpine3.18/docker-entrypoint.sh
rename to haproxy_2.7-alpine3.19/docker-entrypoint.sh
diff --git a/haproxy_3.0-dev-alpine3.18/Dockerfile b/haproxy_3.0-dev-alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_3.0-dev-alpine3.18/Dockerfile
rename to haproxy_3.0-dev-alpine3.19/Dockerfile
index 93707bd..e6063e7 100644
--- a/haproxy_3.0-dev-alpine3.18/Dockerfile
+++ b/haproxy_3.0-dev-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_3.0-dev-alpine3.18/docker-entrypoint.sh b/haproxy_3.0-dev-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.0-dev-alpine3.18/docker-entrypoint.sh
rename to haproxy_3.0-dev-alpine3.19/docker-entrypoint.sh
diff --git a/haproxy_alpine3.18/Dockerfile b/haproxy_alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_alpine3.18/Dockerfile
rename to haproxy_alpine3.19/Dockerfile
index 5c4ea5e..b8adc13 100644
--- a/haproxy_alpine3.18/Dockerfile
+++ b/haproxy_alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_alpine3.18/docker-entrypoint.sh b/haproxy_alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_alpine3.18/docker-entrypoint.sh
rename to haproxy_alpine3.19/docker-entrypoint.sh
diff --git a/haproxy_lts-alpine3.18/Dockerfile b/haproxy_lts-alpine3.19/Dockerfile
similarity index 99%
rename from haproxy_lts-alpine3.18/Dockerfile
rename to haproxy_lts-alpine3.19/Dockerfile
index f794d3c..4cbc6af 100644
--- a/haproxy_lts-alpine3.18/Dockerfile
+++ b/haproxy_lts-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_lts-alpine3.18/docker-entrypoint.sh b/haproxy_lts-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from haproxy_lts-alpine3.18/docker-entrypoint.sh
rename to haproxy_lts-alpine3.19/docker-entrypoint.sh Relevant Maintainers: |
yosifkit
approved these changes
Dec 12, 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: