Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Jun 11, 2020

Changes:

Changes:

- docker-library/httpd@6f891de: Merge pull request docker-library/httpd#161 from J0WI/alpine-3.12
- docker-library/httpd@b52f30b: Upgrade Alpine to 3.12
- docker-library/httpd@1f4f797: Merge pull request docker-library/httpd#159 from docker-library/github-actions
- docker-library/httpd@13a3f77: Add initial GitHub Actions CI
@github-actions
Copy link

Diff for 5020c33:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 48ca041..df69c05 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,5 +8,5 @@ Directory: 2.4
 
 Tags: 2.4.43-alpine, 2.4-alpine, 2-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 6c8e82e20ecefc94c616439f15d14c4bb215b200
+GitCommit: b52f30b211a0e127d498ce7ecbcbb31e6336cff2
 Directory: 2.4/alpine
diff --git a/httpd_alpine/Dockerfile b/httpd_alpine/Dockerfile
index c3a0ef0..bb86fff 100644
--- a/httpd_alpine/Dockerfile
+++ b/httpd_alpine/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 # ensure www-data user exists
 RUN set -x \
 	&& addgroup -g 82 -S www-data \
 	&& adduser -u 82 -D -S -G www-data www-data
 # 82 is the standard uid/gid for "www-data" in Alpine
-# https://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.8.1
-# https://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.8.1
-# https://git.alpinelinux.org/cgit/aports/tree/main/nginx/nginx.pre-install?h=v3.8.1
+# https://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.12.0
+# https://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.12.0
+# https://git.alpinelinux.org/cgit/aports/tree/main/nginx/nginx.pre-install?h=v3.12.0
 
 ENV HTTPD_PREFIX /usr/local/apache2
 ENV PATH $HTTPD_PREFIX/bin:$PATH

@yosifkit yosifkit merged commit d30fce0 into docker-library:master Jun 11, 2020
@yosifkit yosifkit deleted the httpd branch June 11, 2020 18:21
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