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 httpd #18075

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Update httpd #18075

merged 1 commit into from
Dec 11, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 11, 2024

Changes:

Changes:

- docker-library/httpd@e073a36: Merge pull request docker-library/httpd#270 from dzmitry-rudnouski/alpine-3.21
- docker-library/httpd@500ef8b: alpine 3.21
- docker-library/httpd@aec1836: Update README
- docker-library/httpd@bebe68a: Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates
Copy link

Diff for 41bc178:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6993b6e..7ebfd9d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,7 +6,7 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 3056c115a9f3c2467cc6f67470cfded70c4adc64
 Directory: 2.4
 
-Tags: 2.4.62-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.62-alpine3.20, 2.4-alpine3.20, 2-alpine3.20, alpine3.20
+Tags: 2.4.62-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.62-alpine3.21, 2.4-alpine3.21, 2-alpine3.21, alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3056c115a9f3c2467cc6f67470cfded70c4adc64
+GitCommit: 500ef8b71bdf49020ec5bffad2b100936c3f2fab
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 3bdf763..fedb93e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
-httpd:2-alpine3.20
+httpd:2-alpine3.21
 httpd:2-bookworm
 httpd:2.4
 httpd:2.4-alpine
-httpd:2.4-alpine3.20
+httpd:2.4-alpine3.21
 httpd:2.4-bookworm
 httpd:2.4.62
 httpd:2.4.62-alpine
-httpd:2.4.62-alpine3.20
+httpd:2.4.62-alpine3.21
 httpd:2.4.62-bookworm
 httpd:alpine
-httpd:alpine3.20
+httpd:alpine3.21
 httpd:bookworm
 httpd:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 5941862..d778a4d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-httpd:alpine3.20
+httpd:alpine3.21
 httpd:bookworm
diff --git a/httpd_alpine3.20/Dockerfile b/httpd_alpine3.21/Dockerfile
similarity index 99%
rename from httpd_alpine3.20/Dockerfile
rename to httpd_alpine3.21/Dockerfile
index f31e744..f793cbf 100644
--- a/httpd_alpine3.20/Dockerfile
+++ b/httpd_alpine3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 # ensure www-data user exists
 RUN set -x \
diff --git a/httpd_alpine3.20/httpd-foreground b/httpd_alpine3.21/httpd-foreground
similarity index 100%
rename from httpd_alpine3.20/httpd-foreground
rename to httpd_alpine3.21/httpd-foreground

Relevant Maintainers:

@LaurentGoderre LaurentGoderre merged commit 4f65047 into docker-library:master Dec 11, 2024
7 checks passed
@LaurentGoderre LaurentGoderre deleted the httpd branch December 11, 2024 19:39
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