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

Merged
merged 1 commit into from
Nov 30, 2022
Merged

Update httpd #13619

merged 1 commit into from
Nov 30, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 30, 2022

Changes:

Changes:

- docker-library/httpd@6cea763: Merge pull request docker-library/httpd#224 from J0WI/alpine-3.17
- docker-library/httpd@a876851: Alpine 3.17
- docker-library/httpd@ffec80f: Use new "bashbrew" composite action
@github-actions
Copy link

Diff for c30df99:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6c328e9..9a9205b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,7 +6,7 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f3b7fd9c8ef59d1ad46c8b2a27df3e02d822834f
 Directory: 2.4
 
-Tags: 2.4.54-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.54-alpine3.16, 2.4-alpine3.16, 2-alpine3.16, alpine3.16
+Tags: 2.4.54-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.54-alpine3.17, 2.4-alpine3.17, 2-alpine3.17, alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f3b7fd9c8ef59d1ad46c8b2a27df3e02d822834f
+GitCommit: a8768519be284075c5cafd0ed6645d3bedaad6b1
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 53aeb34..8e2fc80 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
-httpd:2-alpine3.16
+httpd:2-alpine3.17
 httpd:2-bullseye
 httpd:2.4
 httpd:2.4-alpine
-httpd:2.4-alpine3.16
+httpd:2.4-alpine3.17
 httpd:2.4-bullseye
 httpd:2.4.54
 httpd:2.4.54-alpine
-httpd:2.4.54-alpine3.16
+httpd:2.4.54-alpine3.17
 httpd:2.4.54-bullseye
 httpd:alpine
-httpd:alpine3.16
+httpd:alpine3.17
 httpd:bullseye
 httpd:latest
diff --git a/httpd_alpine3.16/Dockerfile b/httpd_alpine3.17/Dockerfile
similarity index 99%
rename from httpd_alpine3.16/Dockerfile
rename to httpd_alpine3.17/Dockerfile
index 413c970..16f0929 100644
--- a/httpd_alpine3.16/Dockerfile
+++ b/httpd_alpine3.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 
 # ensure www-data user exists
 RUN set -x \
diff --git a/httpd_alpine3.16/httpd-foreground b/httpd_alpine3.17/httpd-foreground
similarity index 100%
rename from httpd_alpine3.16/httpd-foreground
rename to httpd_alpine3.17/httpd-foreground

Relevant Maintainers:

@yosifkit yosifkit merged commit 877307a into docker-library:master Nov 30, 2022
@yosifkit yosifkit deleted the httpd branch November 30, 2022 20:15
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