Add Alpine 3.14

docker-library · Jun 16, 2021 · a82fd9b · a82fd9b
1 parent cf8840d
commit a82fd9b
Show file tree

Hide file tree

Showing 74 changed files with 91 additions and 105 deletions.
diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile
diff --git a/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile
diff --git a/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile
diff --git a/7.3/alpine3.12/cli/Dockerfile → 7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.12/cli/Dockerfile → 7.3/alpine3.14/cli/Dockerfile
diff --git a/7.3/alpine3.12/cli/docker-php-entrypoint → 7.3/alpine3.14/cli/docker-php-entrypoint b/7.3/alpine3.12/cli/docker-php-entrypoint → 7.3/alpine3.14/cli/docker-php-entrypoint
diff --git a/7.3/alpine3.12/cli/docker-php-ext-configure → 7.3/alpine3.14/cli/docker-php-ext-configure b/7.3/alpine3.12/cli/docker-php-ext-configure → 7.3/alpine3.14/cli/docker-php-ext-configure
diff --git a/7.3/alpine3.12/cli/docker-php-ext-enable → 7.3/alpine3.14/cli/docker-php-ext-enable b/7.3/alpine3.12/cli/docker-php-ext-enable → 7.3/alpine3.14/cli/docker-php-ext-enable
diff --git a/7.3/alpine3.12/cli/docker-php-ext-install → 7.3/alpine3.14/cli/docker-php-ext-install b/7.3/alpine3.12/cli/docker-php-ext-install → 7.3/alpine3.14/cli/docker-php-ext-install
diff --git a/7.3/alpine3.12/cli/docker-php-source → 7.3/alpine3.14/cli/docker-php-source b/7.3/alpine3.12/cli/docker-php-source → 7.3/alpine3.14/cli/docker-php-source
diff --git a/7.3/alpine3.12/fpm/Dockerfile → 7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.12/fpm/Dockerfile → 7.3/alpine3.14/fpm/Dockerfile
diff --git a/7.3/alpine3.12/fpm/docker-php-entrypoint → 7.3/alpine3.14/fpm/docker-php-entrypoint b/7.3/alpine3.12/fpm/docker-php-entrypoint → 7.3/alpine3.14/fpm/docker-php-entrypoint
diff --git a/7.3/alpine3.12/fpm/docker-php-ext-configure → 7.3/alpine3.14/fpm/docker-php-ext-configure b/7.3/alpine3.12/fpm/docker-php-ext-configure → 7.3/alpine3.14/fpm/docker-php-ext-configure
diff --git a/7.3/alpine3.12/fpm/docker-php-ext-enable → 7.3/alpine3.14/fpm/docker-php-ext-enable b/7.3/alpine3.12/fpm/docker-php-ext-enable → 7.3/alpine3.14/fpm/docker-php-ext-enable
diff --git a/7.3/alpine3.12/fpm/docker-php-ext-install → 7.3/alpine3.14/fpm/docker-php-ext-install b/7.3/alpine3.12/fpm/docker-php-ext-install → 7.3/alpine3.14/fpm/docker-php-ext-install
diff --git a/7.3/alpine3.12/fpm/docker-php-source → 7.3/alpine3.14/fpm/docker-php-source b/7.3/alpine3.12/fpm/docker-php-source → 7.3/alpine3.14/fpm/docker-php-source
diff --git a/7.3/alpine3.12/zts/Dockerfile → 7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.12/zts/Dockerfile → 7.3/alpine3.14/zts/Dockerfile
diff --git a/7.3/alpine3.12/zts/docker-php-entrypoint → 7.3/alpine3.14/zts/docker-php-entrypoint b/7.3/alpine3.12/zts/docker-php-entrypoint → 7.3/alpine3.14/zts/docker-php-entrypoint
diff --git a/7.3/alpine3.12/zts/docker-php-ext-configure → 7.3/alpine3.14/zts/docker-php-ext-configure b/7.3/alpine3.12/zts/docker-php-ext-configure → 7.3/alpine3.14/zts/docker-php-ext-configure
diff --git a/7.3/alpine3.12/zts/docker-php-ext-enable → 7.3/alpine3.14/zts/docker-php-ext-enable b/7.3/alpine3.12/zts/docker-php-ext-enable → 7.3/alpine3.14/zts/docker-php-ext-enable
diff --git a/7.3/alpine3.12/zts/docker-php-ext-install → 7.3/alpine3.14/zts/docker-php-ext-install b/7.3/alpine3.12/zts/docker-php-ext-install → 7.3/alpine3.14/zts/docker-php-ext-install
diff --git a/7.3/alpine3.12/zts/docker-php-source → 7.3/alpine3.14/zts/docker-php-source b/7.3/alpine3.12/zts/docker-php-source → 7.3/alpine3.14/zts/docker-php-source
diff --git a/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile
diff --git a/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile
diff --git a/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile
diff --git a/7.4/alpine3.12/cli/Dockerfile → 7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.12/cli/Dockerfile → 7.4/alpine3.14/cli/Dockerfile
diff --git a/7.4/alpine3.12/cli/docker-php-entrypoint → 7.4/alpine3.14/cli/docker-php-entrypoint b/7.4/alpine3.12/cli/docker-php-entrypoint → 7.4/alpine3.14/cli/docker-php-entrypoint
diff --git a/7.4/alpine3.12/cli/docker-php-ext-configure → 7.4/alpine3.14/cli/docker-php-ext-configure b/7.4/alpine3.12/cli/docker-php-ext-configure → 7.4/alpine3.14/cli/docker-php-ext-configure
diff --git a/7.4/alpine3.12/cli/docker-php-ext-enable → 7.4/alpine3.14/cli/docker-php-ext-enable b/7.4/alpine3.12/cli/docker-php-ext-enable → 7.4/alpine3.14/cli/docker-php-ext-enable
diff --git a/7.4/alpine3.12/cli/docker-php-ext-install → 7.4/alpine3.14/cli/docker-php-ext-install b/7.4/alpine3.12/cli/docker-php-ext-install → 7.4/alpine3.14/cli/docker-php-ext-install
diff --git a/7.4/alpine3.12/cli/docker-php-source → 7.4/alpine3.14/cli/docker-php-source b/7.4/alpine3.12/cli/docker-php-source → 7.4/alpine3.14/cli/docker-php-source
diff --git a/7.4/alpine3.12/fpm/Dockerfile → 7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.12/fpm/Dockerfile → 7.4/alpine3.14/fpm/Dockerfile
diff --git a/7.4/alpine3.12/fpm/docker-php-entrypoint → 7.4/alpine3.14/fpm/docker-php-entrypoint b/7.4/alpine3.12/fpm/docker-php-entrypoint → 7.4/alpine3.14/fpm/docker-php-entrypoint
diff --git a/7.4/alpine3.12/fpm/docker-php-ext-configure → 7.4/alpine3.14/fpm/docker-php-ext-configure b/7.4/alpine3.12/fpm/docker-php-ext-configure → 7.4/alpine3.14/fpm/docker-php-ext-configure
diff --git a/7.4/alpine3.12/fpm/docker-php-ext-enable → 7.4/alpine3.14/fpm/docker-php-ext-enable b/7.4/alpine3.12/fpm/docker-php-ext-enable → 7.4/alpine3.14/fpm/docker-php-ext-enable
diff --git a/7.4/alpine3.12/fpm/docker-php-ext-install → 7.4/alpine3.14/fpm/docker-php-ext-install b/7.4/alpine3.12/fpm/docker-php-ext-install → 7.4/alpine3.14/fpm/docker-php-ext-install
diff --git a/7.4/alpine3.12/fpm/docker-php-source → 7.4/alpine3.14/fpm/docker-php-source b/7.4/alpine3.12/fpm/docker-php-source → 7.4/alpine3.14/fpm/docker-php-source
diff --git a/7.4/alpine3.12/zts/Dockerfile → 7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.12/zts/Dockerfile → 7.4/alpine3.14/zts/Dockerfile
diff --git a/7.4/alpine3.12/zts/docker-php-entrypoint → 7.4/alpine3.14/zts/docker-php-entrypoint b/7.4/alpine3.12/zts/docker-php-entrypoint → 7.4/alpine3.14/zts/docker-php-entrypoint
diff --git a/7.4/alpine3.12/zts/docker-php-ext-configure → 7.4/alpine3.14/zts/docker-php-ext-configure b/7.4/alpine3.12/zts/docker-php-ext-configure → 7.4/alpine3.14/zts/docker-php-ext-configure
diff --git a/7.4/alpine3.12/zts/docker-php-ext-enable → 7.4/alpine3.14/zts/docker-php-ext-enable b/7.4/alpine3.12/zts/docker-php-ext-enable → 7.4/alpine3.14/zts/docker-php-ext-enable
diff --git a/7.4/alpine3.12/zts/docker-php-ext-install → 7.4/alpine3.14/zts/docker-php-ext-install b/7.4/alpine3.12/zts/docker-php-ext-install → 7.4/alpine3.14/zts/docker-php-ext-install
diff --git a/7.4/alpine3.12/zts/docker-php-source → 7.4/alpine3.14/zts/docker-php-source b/7.4/alpine3.12/zts/docker-php-source → 7.4/alpine3.14/zts/docker-php-source
diff --git a/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile
diff --git a/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile
diff --git a/8.0/alpine3.12/cli/Dockerfile → 8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.12/cli/Dockerfile → 8.0/alpine3.14/cli/Dockerfile
diff --git a/8.0/alpine3.12/cli/docker-php-entrypoint → 8.0/alpine3.14/cli/docker-php-entrypoint b/8.0/alpine3.12/cli/docker-php-entrypoint → 8.0/alpine3.14/cli/docker-php-entrypoint
diff --git a/8.0/alpine3.12/cli/docker-php-ext-configure → 8.0/alpine3.14/cli/docker-php-ext-configure b/8.0/alpine3.12/cli/docker-php-ext-configure → 8.0/alpine3.14/cli/docker-php-ext-configure
diff --git a/8.0/alpine3.12/cli/docker-php-ext-enable → 8.0/alpine3.14/cli/docker-php-ext-enable b/8.0/alpine3.12/cli/docker-php-ext-enable → 8.0/alpine3.14/cli/docker-php-ext-enable
diff --git a/8.0/alpine3.12/cli/docker-php-ext-install → 8.0/alpine3.14/cli/docker-php-ext-install b/8.0/alpine3.12/cli/docker-php-ext-install → 8.0/alpine3.14/cli/docker-php-ext-install
diff --git a/8.0/alpine3.12/cli/docker-php-source → 8.0/alpine3.14/cli/docker-php-source b/8.0/alpine3.12/cli/docker-php-source → 8.0/alpine3.14/cli/docker-php-source
diff --git a/8.0/alpine3.12/fpm/Dockerfile → 8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.12/fpm/Dockerfile → 8.0/alpine3.14/fpm/Dockerfile
diff --git a/8.0/alpine3.12/fpm/docker-php-entrypoint → 8.0/alpine3.14/fpm/docker-php-entrypoint b/8.0/alpine3.12/fpm/docker-php-entrypoint → 8.0/alpine3.14/fpm/docker-php-entrypoint
diff --git a/8.0/alpine3.12/fpm/docker-php-ext-configure → 8.0/alpine3.14/fpm/docker-php-ext-configure b/8.0/alpine3.12/fpm/docker-php-ext-configure → 8.0/alpine3.14/fpm/docker-php-ext-configure
diff --git a/8.0/alpine3.12/fpm/docker-php-ext-enable → 8.0/alpine3.14/fpm/docker-php-ext-enable b/8.0/alpine3.12/fpm/docker-php-ext-enable → 8.0/alpine3.14/fpm/docker-php-ext-enable
diff --git a/8.0/alpine3.12/fpm/docker-php-ext-install → 8.0/alpine3.14/fpm/docker-php-ext-install b/8.0/alpine3.12/fpm/docker-php-ext-install → 8.0/alpine3.14/fpm/docker-php-ext-install
diff --git a/8.0/alpine3.12/fpm/docker-php-source → 8.0/alpine3.14/fpm/docker-php-source b/8.0/alpine3.12/fpm/docker-php-source → 8.0/alpine3.14/fpm/docker-php-source
diff --git a/8.1-rc/alpine3.13/cli/Dockerfile b/8.1-rc/alpine3.13/cli/Dockerfile
diff --git a/8.1-rc/alpine3.13/fpm/Dockerfile b/8.1-rc/alpine3.13/fpm/Dockerfile
diff --git a/8.1-rc/alpine3.12/cli/Dockerfile → 8.1-rc/alpine3.14/cli/Dockerfile b/8.1-rc/alpine3.12/cli/Dockerfile → 8.1-rc/alpine3.14/cli/Dockerfile
diff --git a/8.1-rc/alpine3.12/cli/docker-php-entrypoint → 8.1-rc/alpine3.14/cli/docker-php-entrypoint b/8.1-rc/alpine3.12/cli/docker-php-entrypoint → 8.1-rc/alpine3.14/cli/docker-php-entrypoint
diff --git a/...c/alpine3.12/cli/docker-php-ext-configure → ...c/alpine3.14/cli/docker-php-ext-configure b/...c/alpine3.12/cli/docker-php-ext-configure → ...c/alpine3.14/cli/docker-php-ext-configure
diff --git a/8.1-rc/alpine3.12/cli/docker-php-ext-enable → 8.1-rc/alpine3.14/cli/docker-php-ext-enable b/8.1-rc/alpine3.12/cli/docker-php-ext-enable → 8.1-rc/alpine3.14/cli/docker-php-ext-enable
diff --git a/8.1-rc/alpine3.12/cli/docker-php-ext-install → 8.1-rc/alpine3.14/cli/docker-php-ext-install b/8.1-rc/alpine3.12/cli/docker-php-ext-install → 8.1-rc/alpine3.14/cli/docker-php-ext-install
diff --git a/8.1-rc/alpine3.12/cli/docker-php-source → 8.1-rc/alpine3.14/cli/docker-php-source b/8.1-rc/alpine3.12/cli/docker-php-source → 8.1-rc/alpine3.14/cli/docker-php-source
diff --git a/8.1-rc/alpine3.12/fpm/Dockerfile → 8.1-rc/alpine3.14/fpm/Dockerfile b/8.1-rc/alpine3.12/fpm/Dockerfile → 8.1-rc/alpine3.14/fpm/Dockerfile
diff --git a/8.1-rc/alpine3.12/fpm/docker-php-entrypoint → 8.1-rc/alpine3.14/fpm/docker-php-entrypoint b/8.1-rc/alpine3.12/fpm/docker-php-entrypoint → 8.1-rc/alpine3.14/fpm/docker-php-entrypoint
diff --git a/...c/alpine3.12/fpm/docker-php-ext-configure → ...c/alpine3.14/fpm/docker-php-ext-configure b/...c/alpine3.12/fpm/docker-php-ext-configure → ...c/alpine3.14/fpm/docker-php-ext-configure
diff --git a/8.1-rc/alpine3.12/fpm/docker-php-ext-enable → 8.1-rc/alpine3.14/fpm/docker-php-ext-enable b/8.1-rc/alpine3.12/fpm/docker-php-ext-enable → 8.1-rc/alpine3.14/fpm/docker-php-ext-enable
diff --git a/8.1-rc/alpine3.12/fpm/docker-php-ext-install → 8.1-rc/alpine3.14/fpm/docker-php-ext-install b/8.1-rc/alpine3.12/fpm/docker-php-ext-install → 8.1-rc/alpine3.14/fpm/docker-php-ext-install
diff --git a/8.1-rc/alpine3.12/fpm/docker-php-source → 8.1-rc/alpine3.14/fpm/docker-php-source b/8.1-rc/alpine3.12/fpm/docker-php-source → 8.1-rc/alpine3.14/fpm/docker-php-source
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -25,12 +25,14 @@ RUN apk add --no-cache \
 
 # ensure www-data user exists
 RUN set -eux; \
+{{ if (env.from == "alpine:3.13") then ( -}}
 	addgroup -g 82 -S www-data; \
+{{ ) else "" end -}}
 	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/aports/tree/main/apache2/apache2.pre-install?h=3.9-stable
-# https://git.alpinelinux.org/aports/tree/main/lighttpd/lighttpd.pre-install?h=3.9-stable
-# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install?h=3.9-stable
+# https://git.alpinelinux.org/aports/tree/main/apache2/apache2.pre-install?h=3.14-stable
+# https://git.alpinelinux.org/aports/tree/main/lighttpd/lighttpd.pre-install?h=3.14-stable
+# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install?h=3.14-stable
 
 ENV PHP_INI_DIR /usr/local/etc/php
 RUN set -eux; \