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 #15886

Merged
merged 1 commit into from
Dec 12, 2023
Merged

Update httpd #15886

merged 1 commit into from
Dec 12, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 11, 2023

Changes:

Changes:

- docker-library/httpd@883c215: Merge pull request docker-library/httpd#246 from J0WI/alpine-3.19
- docker-library/httpd@8a57cc5: Alpine 3.19
Copy link

Diff for 07896ae:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b4dc8c8..4472426 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,7 +6,7 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 338f9a4b1e36e09ad2733f36f19e31157f5c959c
 Directory: 2.4
 
-Tags: 2.4.58-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.58-alpine3.18, 2.4-alpine3.18, 2-alpine3.18, alpine3.18
+Tags: 2.4.58-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.58-alpine3.19, 2.4-alpine3.19, 2-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 338f9a4b1e36e09ad2733f36f19e31157f5c959c
+GitCommit: 8a57cc5e01d709b1ae7176a2e85a47923865da0c
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index ea03ac6..10b80f2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
-httpd:2-alpine3.18
+httpd:2-alpine3.19
 httpd:2-bookworm
 httpd:2.4
 httpd:2.4-alpine
-httpd:2.4-alpine3.18
+httpd:2.4-alpine3.19
 httpd:2.4-bookworm
 httpd:2.4.58
 httpd:2.4.58-alpine
-httpd:2.4.58-alpine3.18
+httpd:2.4.58-alpine3.19
 httpd:2.4.58-bookworm
 httpd:alpine
-httpd:alpine3.18
+httpd:alpine3.19
 httpd:bookworm
 httpd:latest
diff --git a/httpd_alpine3.18/Dockerfile b/httpd_alpine3.19/Dockerfile
similarity index 99%
rename from httpd_alpine3.18/Dockerfile
rename to httpd_alpine3.19/Dockerfile
index 21c7451..c61d98b 100644
--- a/httpd_alpine3.18/Dockerfile
+++ b/httpd_alpine3.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 
 # ensure www-data user exists
 RUN set -x \
diff --git a/httpd_alpine3.18/httpd-foreground b/httpd_alpine3.19/httpd-foreground
similarity index 100%
rename from httpd_alpine3.18/httpd-foreground
rename to httpd_alpine3.19/httpd-foreground

Relevant Maintainers:

@yosifkit yosifkit merged commit 80c983c into docker-library:master Dec 12, 2023
7 checks passed
@yosifkit yosifkit deleted the httpd branch December 12, 2023 19:01
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