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.

Sign up for GitHub

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

Jump to bottom

Update haproxy #18089

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Update haproxy #18089

merged 1 commit into from
Dec 13, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 13, 2024

Changes:

@docker-library-bot
Update haproxy
5755cb7 
Changes:

- docker-library/haproxy@5e7227a: Merge pull request docker-library/haproxy#239 from infosiftr/alpine3.21
- docker-library/haproxy@34494c3: Update to Alpine 3.21
@tianon tianon requested a review from a team as a code owner December 13, 2024 00:56
@github-actions GitHub Actions
Copy link

Diff for 5755cb7: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1afabf5..6c93a34 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,9 +11,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: a59d80d27242e98cb3fa234e5fa9c81a3968be18
 Directory: 2.4
 
-Tags: 2.4.28-alpine, 2.4-alpine, 2.4.28-alpine3.20, 2.4-alpine3.20
+Tags: 2.4.28-alpine, 2.4-alpine, 2.4.28-alpine3.21, 2.4-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a59d80d27242e98cb3fa234e5fa9c81a3968be18
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 2.4/alpine
 
 Tags: 2.6.20, 2.6, 2.6.20-bookworm, 2.6-bookworm
@@ -21,9 +21,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: a0cdd805ad2cccf3400fb99dd18d0f49579d1cf4
 Directory: 2.6
 
-Tags: 2.6.20-alpine, 2.6-alpine, 2.6.20-alpine3.20, 2.6-alpine3.20
+Tags: 2.6.20-alpine, 2.6-alpine, 2.6.20-alpine3.21, 2.6-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a0cdd805ad2cccf3400fb99dd18d0f49579d1cf4
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 2.6/alpine
 
 Tags: 2.8.13, 2.8, 2.8.13-bookworm, 2.8-bookworm
@@ -31,9 +31,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: ff4e3ce324778f1c2b65d6d61ddbf00c0b51793b
 Directory: 2.8
 
-Tags: 2.8.13-alpine, 2.8-alpine, 2.8.13-alpine3.20, 2.8-alpine3.20
+Tags: 2.8.13-alpine, 2.8-alpine, 2.8.13-alpine3.21, 2.8-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: ff4e3ce324778f1c2b65d6d61ddbf00c0b51793b
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 2.8/alpine
 
 Tags: 2.9.13, 2.9, 2.9.13-bookworm, 2.9-bookworm
@@ -41,9 +41,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 0c1da312a638ecef78b17c6919ec9780bc1f75e9
 Directory: 2.9
 
-Tags: 2.9.13-alpine, 2.9-alpine, 2.9.13-alpine3.20, 2.9-alpine3.20
+Tags: 2.9.13-alpine, 2.9-alpine, 2.9.13-alpine3.21, 2.9-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0c1da312a638ecef78b17c6919ec9780bc1f75e9
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 2.9/alpine
 
 Tags: 3.0.7, 3.0, lts, 3.0.7-bookworm, 3.0-bookworm, lts-bookworm
@@ -51,9 +51,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f0dc84e9e09aa9aa758e6f9340ee0ab3b440930d
 Directory: 3.0
 
-Tags: 3.0.7-alpine, 3.0-alpine, lts-alpine, 3.0.7-alpine3.20, 3.0-alpine3.20, lts-alpine3.20
+Tags: 3.0.7-alpine, 3.0-alpine, lts-alpine, 3.0.7-alpine3.21, 3.0-alpine3.21, lts-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f0dc84e9e09aa9aa758e6f9340ee0ab3b440930d
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 3.0/alpine
 
 Tags: 3.1.1, 3.1, latest, 3.1.1-bookworm, 3.1-bookworm, bookworm
@@ -61,9 +61,9 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: dc5f5ce22146dc39f7597ab9f857f0408622c8d8
 Directory: 3.1
 
-Tags: 3.1.1-alpine, 3.1-alpine, alpine, 3.1.1-alpine3.20, 3.1-alpine3.20, alpine3.20
+Tags: 3.1.1-alpine, 3.1-alpine, alpine, 3.1.1-alpine3.21, 3.1-alpine3.21, alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: dc5f5ce22146dc39f7597ab9f857f0408622c8d8
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 3.1/alpine
 
 Tags: 3.2-dev1, 3.2-dev, 3.2-dev1-bookworm, 3.2-dev-bookworm
@@ -71,7 +71,7 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 98981317e3520043f10841a76e8c0f691b29037d
 Directory: 3.2
 
-Tags: 3.2-dev1-alpine, 3.2-dev-alpine, 3.2-dev1-alpine3.20, 3.2-dev-alpine3.20
+Tags: 3.2-dev1-alpine, 3.2-dev-alpine, 3.2-dev1-alpine3.21, 3.2-dev-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 98981317e3520043f10841a76e8c0f691b29037d
+GitCommit: 34494c3b5479daab25cc47dd4790d93dfaebe9ac
 Directory: 3.2/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 929da1b..d57b552 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,65 +4,65 @@ haproxy:2.2.33
 haproxy:2.2.33-bullseye
 haproxy:2.4
 haproxy:2.4-alpine
-haproxy:2.4-alpine3.20
+haproxy:2.4-alpine3.21
 haproxy:2.4-bookworm
 haproxy:2.4.28
 haproxy:2.4.28-alpine
-haproxy:2.4.28-alpine3.20
+haproxy:2.4.28-alpine3.21
 haproxy:2.4.28-bookworm
 haproxy:2.6
 haproxy:2.6-alpine
-haproxy:2.6-alpine3.20
+haproxy:2.6-alpine3.21
 haproxy:2.6-bookworm
 haproxy:2.6.20
 haproxy:2.6.20-alpine
-haproxy:2.6.20-alpine3.20
+haproxy:2.6.20-alpine3.21
 haproxy:2.6.20-bookworm
 haproxy:2.8
 haproxy:2.8-alpine
-haproxy:2.8-alpine3.20
+haproxy:2.8-alpine3.21
 haproxy:2.8-bookworm
 haproxy:2.8.13
 haproxy:2.8.13-alpine
-haproxy:2.8.13-alpine3.20
+haproxy:2.8.13-alpine3.21
 haproxy:2.8.13-bookworm
 haproxy:2.9
 haproxy:2.9-alpine
-haproxy:2.9-alpine3.20
+haproxy:2.9-alpine3.21
 haproxy:2.9-bookworm
 haproxy:2.9.13
 haproxy:2.9.13-alpine
-haproxy:2.9.13-alpine3.20
+haproxy:2.9.13-alpine3.21
 haproxy:2.9.13-bookworm
 haproxy:3.0
 haproxy:3.0-alpine
-haproxy:3.0-alpine3.20
+haproxy:3.0-alpine3.21
 haproxy:3.0-bookworm
 haproxy:3.0.7
 haproxy:3.0.7-alpine
-haproxy:3.0.7-alpine3.20
+haproxy:3.0.7-alpine3.21
 haproxy:3.0.7-bookworm
 haproxy:3.1
 haproxy:3.1-alpine
-haproxy:3.1-alpine3.20
+haproxy:3.1-alpine3.21
 haproxy:3.1-bookworm
 haproxy:3.1.1
 haproxy:3.1.1-alpine
-haproxy:3.1.1-alpine3.20
+haproxy:3.1.1-alpine3.21
 haproxy:3.1.1-bookworm
 haproxy:3.2-dev
 haproxy:3.2-dev1
 haproxy:3.2-dev1-alpine
-haproxy:3.2-dev1-alpine3.20
+haproxy:3.2-dev1-alpine3.21
 haproxy:3.2-dev1-bookworm
 haproxy:3.2-dev-alpine
-haproxy:3.2-dev-alpine3.20
+haproxy:3.2-dev-alpine3.21
 haproxy:3.2-dev-bookworm
 haproxy:alpine
-haproxy:alpine3.20
+haproxy:alpine3.21
 haproxy:bookworm
 haproxy:latest
 haproxy:lts
 haproxy:lts-alpine
-haproxy:lts-alpine3.20
+haproxy:lts-alpine3.21
 haproxy:lts-bookworm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c0008fb..414ac46 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,15 +1,15 @@
 haproxy:2.2-bullseye
-haproxy:2.4-alpine3.20
+haproxy:2.4-alpine3.21
 haproxy:2.4-bookworm
-haproxy:2.6-alpine3.20
+haproxy:2.6-alpine3.21
 haproxy:2.6-bookworm
-haproxy:2.8-alpine3.20
+haproxy:2.8-alpine3.21
 haproxy:2.8-bookworm
-haproxy:2.9-alpine3.20
+haproxy:2.9-alpine3.21
 haproxy:2.9-bookworm
-haproxy:3.2-dev-alpine3.20
+haproxy:3.2-dev-alpine3.21
 haproxy:3.2-dev-bookworm
-haproxy:alpine3.20
+haproxy:alpine3.21
 haproxy:bookworm
-haproxy:lts-alpine3.20
+haproxy:lts-alpine3.21
 haproxy:lts-bookworm
diff --git a/haproxy_2.4-alpine3.20/Dockerfile b/haproxy_2.4-alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_2.4-alpine3.20/Dockerfile
rename to haproxy_2.4-alpine3.21/Dockerfile
index 3928eae..773cd5b 100644
--- a/haproxy_2.4-alpine3.20/Dockerfile
+++ b/haproxy_2.4-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_2.4-alpine3.20/docker-entrypoint.sh b/haproxy_2.4-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.4-alpine3.20/docker-entrypoint.sh
rename to haproxy_2.4-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_2.6-alpine3.20/Dockerfile b/haproxy_2.6-alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_2.6-alpine3.20/Dockerfile
rename to haproxy_2.6-alpine3.21/Dockerfile
index 152a300..fa92f8a 100644
--- a/haproxy_2.6-alpine3.20/Dockerfile
+++ b/haproxy_2.6-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_2.6-alpine3.20/docker-entrypoint.sh b/haproxy_2.6-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.6-alpine3.20/docker-entrypoint.sh
rename to haproxy_2.6-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_2.8-alpine3.20/Dockerfile b/haproxy_2.8-alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_2.8-alpine3.20/Dockerfile
rename to haproxy_2.8-alpine3.21/Dockerfile
index dc51f0a..33594de 100644
--- a/haproxy_2.8-alpine3.20/Dockerfile
+++ b/haproxy_2.8-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_2.8-alpine3.20/docker-entrypoint.sh b/haproxy_2.8-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.8-alpine3.20/docker-entrypoint.sh
rename to haproxy_2.8-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_2.9-alpine3.20/Dockerfile b/haproxy_2.9-alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_2.9-alpine3.20/Dockerfile
rename to haproxy_2.9-alpine3.21/Dockerfile
index 5c8e983..ab5265e 100644
--- a/haproxy_2.9-alpine3.20/Dockerfile
+++ b/haproxy_2.9-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_2.9-alpine3.20/docker-entrypoint.sh b/haproxy_2.9-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.9-alpine3.20/docker-entrypoint.sh
rename to haproxy_2.9-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_3.2-dev-alpine3.20/Dockerfile b/haproxy_3.2-dev-alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_3.2-dev-alpine3.20/Dockerfile
rename to haproxy_3.2-dev-alpine3.21/Dockerfile
index 2c7cde3..09842ef 100644
--- a/haproxy_3.2-dev-alpine3.20/Dockerfile
+++ b/haproxy_3.2-dev-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_3.2-dev-alpine3.20/docker-entrypoint.sh b/haproxy_3.2-dev-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.2-dev-alpine3.20/docker-entrypoint.sh
rename to haproxy_3.2-dev-alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_alpine3.20/Dockerfile b/haproxy_alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_alpine3.20/Dockerfile
rename to haproxy_alpine3.21/Dockerfile
index c42b48c..d96c758 100644
--- a/haproxy_alpine3.20/Dockerfile
+++ b/haproxy_alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_alpine3.20/docker-entrypoint.sh b/haproxy_alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_alpine3.20/docker-entrypoint.sh
rename to haproxy_alpine3.21/docker-entrypoint.sh
diff --git a/haproxy_lts-alpine3.20/Dockerfile b/haproxy_lts-alpine3.21/Dockerfile
similarity index 99%
rename from haproxy_lts-alpine3.20/Dockerfile
rename to haproxy_lts-alpine3.21/Dockerfile
index a6e44ce..c91941b 100644
--- a/haproxy_lts-alpine3.20/Dockerfile
+++ b/haproxy_lts-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # runtime dependencies
 RUN set -eux; \
diff --git a/haproxy_lts-alpine3.20/docker-entrypoint.sh b/haproxy_lts-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from haproxy_lts-alpine3.20/docker-entrypoint.sh
rename to haproxy_lts-alpine3.21/docker-entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit 946f19f into docker-library:master Dec 13, 2024
20 checks passed
@yosifkit yosifkit deleted the haproxy branch December 13, 2024 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/haproxy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot