Skip to content

Update httpd #19176

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

Merged
merged 1 commit into from
Jun 2, 2025
Merged

Update httpd #19176

merged 1 commit into from
Jun 2, 2025

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Jun 2, 2025

Changes:

Changes:

- docker-library/httpd@da5e392: Merge pull request docker-library/httpd#274 from infosiftr/alpine3.22
- docker-library/httpd@7b36de3: Update to Alpine 3.22
- docker-library/httpd@116c9ee: Update shebang from /bin/bash to /usr/bin/env bash
@yosifkit yosifkit requested review from LaurentGoderre and a team as code owners June 2, 2025 17:10
Copy link

github-actions bot commented Jun 2, 2025

Diff for d4beaf8:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4f39932..6bd4c49 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,7 +6,7 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 329f85a9ad75526de865749a41b273ead99fb69b
 Directory: 2.4
 
-Tags: 2.4.63-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.63-alpine3.21, 2.4-alpine3.21, 2-alpine3.21, alpine3.21
+Tags: 2.4.63-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.63-alpine3.22, 2.4-alpine3.22, 2-alpine3.22, alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 329f85a9ad75526de865749a41b273ead99fb69b
+GitCommit: 7b36de3e42a8698eab0938ee92f93cfddf6ff835
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 6731b16..71d2b0d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
-httpd:2-alpine3.21
+httpd:2-alpine3.22
 httpd:2-bookworm
 httpd:2.4
 httpd:2.4-alpine
-httpd:2.4-alpine3.21
+httpd:2.4-alpine3.22
 httpd:2.4-bookworm
 httpd:2.4.63
 httpd:2.4.63-alpine
-httpd:2.4.63-alpine3.21
+httpd:2.4.63-alpine3.22
 httpd:2.4.63-bookworm
 httpd:alpine
-httpd:alpine3.21
+httpd:alpine3.22
 httpd:bookworm
 httpd:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d778a4d..5dc8491 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-httpd:alpine3.21
+httpd:alpine3.22
 httpd:bookworm
diff --git a/httpd_alpine3.21/Dockerfile b/httpd_alpine3.22/Dockerfile
similarity index 99%
rename from httpd_alpine3.21/Dockerfile
rename to httpd_alpine3.22/Dockerfile
index 50c9e20..1ed99cd 100644
--- a/httpd_alpine3.21/Dockerfile
+++ b/httpd_alpine3.22/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.21
+FROM alpine:3.22
 
 # ensure www-data user exists
 RUN set -x \
diff --git a/httpd_alpine3.21/httpd-foreground b/httpd_alpine3.22/httpd-foreground
similarity index 100%
rename from httpd_alpine3.21/httpd-foreground
rename to httpd_alpine3.22/httpd-foreground

Relevant Maintainers:

@tianon tianon merged commit 9cf8bae into docker-library:master Jun 2, 2025
7 checks passed
@tianon tianon deleted the httpd branch June 2, 2025 17:26
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