diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile index dae0b673..ea7677a7 100644 --- a/7.3/alpine3.13/cli/Dockerfile +++ b/7.3/alpine3.13/cli/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile index bd59a6c8..9c423fb9 100644 --- a/7.3/alpine3.13/fpm/Dockerfile +++ b/7.3/alpine3.13/fpm/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile index 473f755f..68168054 100644 --- a/7.3/alpine3.13/zts/Dockerfile +++ b/7.3/alpine3.13/zts/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/7.3/alpine3.12/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile similarity index 98% rename from 7.3/alpine3.12/cli/Dockerfile rename to 7.3/alpine3.14/cli/Dockerfile index 4dac840e..b5c67ede 100644 --- a/7.3/alpine3.12/cli/Dockerfile +++ b/7.3/alpine3.14/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/7.3/alpine3.12/cli/docker-php-entrypoint b/7.3/alpine3.14/cli/docker-php-entrypoint similarity index 100% rename from 7.3/alpine3.12/cli/docker-php-entrypoint rename to 7.3/alpine3.14/cli/docker-php-entrypoint diff --git a/7.3/alpine3.12/cli/docker-php-ext-configure b/7.3/alpine3.14/cli/docker-php-ext-configure similarity index 100% rename from 7.3/alpine3.12/cli/docker-php-ext-configure rename to 7.3/alpine3.14/cli/docker-php-ext-configure diff --git a/7.3/alpine3.12/cli/docker-php-ext-enable b/7.3/alpine3.14/cli/docker-php-ext-enable similarity index 100% rename from 7.3/alpine3.12/cli/docker-php-ext-enable rename to 7.3/alpine3.14/cli/docker-php-ext-enable diff --git a/7.3/alpine3.12/cli/docker-php-ext-install b/7.3/alpine3.14/cli/docker-php-ext-install similarity index 100% rename from 7.3/alpine3.12/cli/docker-php-ext-install rename to 7.3/alpine3.14/cli/docker-php-ext-install diff --git a/7.3/alpine3.12/cli/docker-php-source b/7.3/alpine3.14/cli/docker-php-source similarity index 100% rename from 7.3/alpine3.12/cli/docker-php-source rename to 7.3/alpine3.14/cli/docker-php-source diff --git a/7.3/alpine3.12/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile similarity index 98% rename from 7.3/alpine3.12/fpm/Dockerfile rename to 7.3/alpine3.14/fpm/Dockerfile index 71318900..58847a03 100644 --- a/7.3/alpine3.12/fpm/Dockerfile +++ b/7.3/alpine3.14/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/7.3/alpine3.12/fpm/docker-php-entrypoint b/7.3/alpine3.14/fpm/docker-php-entrypoint similarity index 100% rename from 7.3/alpine3.12/fpm/docker-php-entrypoint rename to 7.3/alpine3.14/fpm/docker-php-entrypoint diff --git a/7.3/alpine3.12/fpm/docker-php-ext-configure b/7.3/alpine3.14/fpm/docker-php-ext-configure similarity index 100% rename from 7.3/alpine3.12/fpm/docker-php-ext-configure rename to 7.3/alpine3.14/fpm/docker-php-ext-configure diff --git a/7.3/alpine3.12/fpm/docker-php-ext-enable b/7.3/alpine3.14/fpm/docker-php-ext-enable similarity index 100% rename from 7.3/alpine3.12/fpm/docker-php-ext-enable rename to 7.3/alpine3.14/fpm/docker-php-ext-enable diff --git a/7.3/alpine3.12/fpm/docker-php-ext-install b/7.3/alpine3.14/fpm/docker-php-ext-install similarity index 100% rename from 7.3/alpine3.12/fpm/docker-php-ext-install rename to 7.3/alpine3.14/fpm/docker-php-ext-install diff --git a/7.3/alpine3.12/fpm/docker-php-source b/7.3/alpine3.14/fpm/docker-php-source similarity index 100% rename from 7.3/alpine3.12/fpm/docker-php-source rename to 7.3/alpine3.14/fpm/docker-php-source diff --git a/7.3/alpine3.12/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile similarity index 98% rename from 7.3/alpine3.12/zts/Dockerfile rename to 7.3/alpine3.14/zts/Dockerfile index 077ba1a6..0d99ac40 100644 --- a/7.3/alpine3.12/zts/Dockerfile +++ b/7.3/alpine3.14/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/7.3/alpine3.12/zts/docker-php-entrypoint b/7.3/alpine3.14/zts/docker-php-entrypoint similarity index 100% rename from 7.3/alpine3.12/zts/docker-php-entrypoint rename to 7.3/alpine3.14/zts/docker-php-entrypoint diff --git a/7.3/alpine3.12/zts/docker-php-ext-configure b/7.3/alpine3.14/zts/docker-php-ext-configure similarity index 100% rename from 7.3/alpine3.12/zts/docker-php-ext-configure rename to 7.3/alpine3.14/zts/docker-php-ext-configure diff --git a/7.3/alpine3.12/zts/docker-php-ext-enable b/7.3/alpine3.14/zts/docker-php-ext-enable similarity index 100% rename from 7.3/alpine3.12/zts/docker-php-ext-enable rename to 7.3/alpine3.14/zts/docker-php-ext-enable diff --git a/7.3/alpine3.12/zts/docker-php-ext-install b/7.3/alpine3.14/zts/docker-php-ext-install similarity index 100% rename from 7.3/alpine3.12/zts/docker-php-ext-install rename to 7.3/alpine3.14/zts/docker-php-ext-install diff --git a/7.3/alpine3.12/zts/docker-php-source b/7.3/alpine3.14/zts/docker-php-source similarity index 100% rename from 7.3/alpine3.12/zts/docker-php-source rename to 7.3/alpine3.14/zts/docker-php-source diff --git a/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile index f398e23e..648c25c4 100644 --- a/7.4/alpine3.13/cli/Dockerfile +++ b/7.4/alpine3.13/cli/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile index e2040fac..c0f9cce2 100644 --- a/7.4/alpine3.13/fpm/Dockerfile +++ b/7.4/alpine3.13/fpm/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile index a5892828..2d5e4aab 100644 --- a/7.4/alpine3.13/zts/Dockerfile +++ b/7.4/alpine3.13/zts/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/7.4/alpine3.12/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile similarity index 98% rename from 7.4/alpine3.12/cli/Dockerfile rename to 7.4/alpine3.14/cli/Dockerfile index db29f4fb..5bd6dbdd 100644 --- a/7.4/alpine3.12/cli/Dockerfile +++ b/7.4/alpine3.14/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/7.4/alpine3.12/cli/docker-php-entrypoint b/7.4/alpine3.14/cli/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.12/cli/docker-php-entrypoint rename to 7.4/alpine3.14/cli/docker-php-entrypoint diff --git a/7.4/alpine3.12/cli/docker-php-ext-configure b/7.4/alpine3.14/cli/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.12/cli/docker-php-ext-configure rename to 7.4/alpine3.14/cli/docker-php-ext-configure diff --git a/7.4/alpine3.12/cli/docker-php-ext-enable b/7.4/alpine3.14/cli/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.12/cli/docker-php-ext-enable rename to 7.4/alpine3.14/cli/docker-php-ext-enable diff --git a/7.4/alpine3.12/cli/docker-php-ext-install b/7.4/alpine3.14/cli/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.12/cli/docker-php-ext-install rename to 7.4/alpine3.14/cli/docker-php-ext-install diff --git a/7.4/alpine3.12/cli/docker-php-source b/7.4/alpine3.14/cli/docker-php-source similarity index 100% rename from 7.4/alpine3.12/cli/docker-php-source rename to 7.4/alpine3.14/cli/docker-php-source diff --git a/7.4/alpine3.12/fpm/Dockerfile b/7.4/alpine3.14/fpm/Dockerfile similarity index 98% rename from 7.4/alpine3.12/fpm/Dockerfile rename to 7.4/alpine3.14/fpm/Dockerfile index 92ffc358..fa658d5b 100644 --- a/7.4/alpine3.12/fpm/Dockerfile +++ b/7.4/alpine3.14/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/7.4/alpine3.12/fpm/docker-php-entrypoint b/7.4/alpine3.14/fpm/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.12/fpm/docker-php-entrypoint rename to 7.4/alpine3.14/fpm/docker-php-entrypoint diff --git a/7.4/alpine3.12/fpm/docker-php-ext-configure b/7.4/alpine3.14/fpm/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.12/fpm/docker-php-ext-configure rename to 7.4/alpine3.14/fpm/docker-php-ext-configure diff --git a/7.4/alpine3.12/fpm/docker-php-ext-enable b/7.4/alpine3.14/fpm/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.12/fpm/docker-php-ext-enable rename to 7.4/alpine3.14/fpm/docker-php-ext-enable diff --git a/7.4/alpine3.12/fpm/docker-php-ext-install b/7.4/alpine3.14/fpm/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.12/fpm/docker-php-ext-install rename to 7.4/alpine3.14/fpm/docker-php-ext-install diff --git a/7.4/alpine3.12/fpm/docker-php-source b/7.4/alpine3.14/fpm/docker-php-source similarity index 100% rename from 7.4/alpine3.12/fpm/docker-php-source rename to 7.4/alpine3.14/fpm/docker-php-source diff --git a/7.4/alpine3.12/zts/Dockerfile b/7.4/alpine3.14/zts/Dockerfile similarity index 98% rename from 7.4/alpine3.12/zts/Dockerfile rename to 7.4/alpine3.14/zts/Dockerfile index d297ed17..48177372 100644 --- a/7.4/alpine3.12/zts/Dockerfile +++ b/7.4/alpine3.14/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/7.4/alpine3.12/zts/docker-php-entrypoint b/7.4/alpine3.14/zts/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.12/zts/docker-php-entrypoint rename to 7.4/alpine3.14/zts/docker-php-entrypoint diff --git a/7.4/alpine3.12/zts/docker-php-ext-configure b/7.4/alpine3.14/zts/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.12/zts/docker-php-ext-configure rename to 7.4/alpine3.14/zts/docker-php-ext-configure diff --git a/7.4/alpine3.12/zts/docker-php-ext-enable b/7.4/alpine3.14/zts/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.12/zts/docker-php-ext-enable rename to 7.4/alpine3.14/zts/docker-php-ext-enable diff --git a/7.4/alpine3.12/zts/docker-php-ext-install b/7.4/alpine3.14/zts/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.12/zts/docker-php-ext-install rename to 7.4/alpine3.14/zts/docker-php-ext-install diff --git a/7.4/alpine3.12/zts/docker-php-source b/7.4/alpine3.14/zts/docker-php-source similarity index 100% rename from 7.4/alpine3.12/zts/docker-php-source rename to 7.4/alpine3.14/zts/docker-php-source diff --git a/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile index cd69e72f..cb6ea3a3 100644 --- a/8.0/alpine3.13/cli/Dockerfile +++ b/8.0/alpine3.13/cli/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile index 155c6606..de4c0b0f 100644 --- a/8.0/alpine3.13/fpm/Dockerfile +++ b/8.0/alpine3.13/fpm/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/8.0/alpine3.12/cli/Dockerfile b/8.0/alpine3.14/cli/Dockerfile similarity index 98% rename from 8.0/alpine3.12/cli/Dockerfile rename to 8.0/alpine3.14/cli/Dockerfile index 69bbce4e..330d6c77 100644 --- a/8.0/alpine3.12/cli/Dockerfile +++ b/8.0/alpine3.14/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/8.0/alpine3.12/cli/docker-php-entrypoint b/8.0/alpine3.14/cli/docker-php-entrypoint similarity index 100% rename from 8.0/alpine3.12/cli/docker-php-entrypoint rename to 8.0/alpine3.14/cli/docker-php-entrypoint diff --git a/8.0/alpine3.12/cli/docker-php-ext-configure b/8.0/alpine3.14/cli/docker-php-ext-configure similarity index 100% rename from 8.0/alpine3.12/cli/docker-php-ext-configure rename to 8.0/alpine3.14/cli/docker-php-ext-configure diff --git a/8.0/alpine3.12/cli/docker-php-ext-enable b/8.0/alpine3.14/cli/docker-php-ext-enable similarity index 100% rename from 8.0/alpine3.12/cli/docker-php-ext-enable rename to 8.0/alpine3.14/cli/docker-php-ext-enable diff --git a/8.0/alpine3.12/cli/docker-php-ext-install b/8.0/alpine3.14/cli/docker-php-ext-install similarity index 100% rename from 8.0/alpine3.12/cli/docker-php-ext-install rename to 8.0/alpine3.14/cli/docker-php-ext-install diff --git a/8.0/alpine3.12/cli/docker-php-source b/8.0/alpine3.14/cli/docker-php-source similarity index 100% rename from 8.0/alpine3.12/cli/docker-php-source rename to 8.0/alpine3.14/cli/docker-php-source diff --git a/8.0/alpine3.12/fpm/Dockerfile b/8.0/alpine3.14/fpm/Dockerfile similarity index 98% rename from 8.0/alpine3.12/fpm/Dockerfile rename to 8.0/alpine3.14/fpm/Dockerfile index 3f4cccda..69f6aeae 100644 --- a/8.0/alpine3.12/fpm/Dockerfile +++ b/8.0/alpine3.14/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/8.0/alpine3.12/fpm/docker-php-entrypoint b/8.0/alpine3.14/fpm/docker-php-entrypoint similarity index 100% rename from 8.0/alpine3.12/fpm/docker-php-entrypoint rename to 8.0/alpine3.14/fpm/docker-php-entrypoint diff --git a/8.0/alpine3.12/fpm/docker-php-ext-configure b/8.0/alpine3.14/fpm/docker-php-ext-configure similarity index 100% rename from 8.0/alpine3.12/fpm/docker-php-ext-configure rename to 8.0/alpine3.14/fpm/docker-php-ext-configure diff --git a/8.0/alpine3.12/fpm/docker-php-ext-enable b/8.0/alpine3.14/fpm/docker-php-ext-enable similarity index 100% rename from 8.0/alpine3.12/fpm/docker-php-ext-enable rename to 8.0/alpine3.14/fpm/docker-php-ext-enable diff --git a/8.0/alpine3.12/fpm/docker-php-ext-install b/8.0/alpine3.14/fpm/docker-php-ext-install similarity index 100% rename from 8.0/alpine3.12/fpm/docker-php-ext-install rename to 8.0/alpine3.14/fpm/docker-php-ext-install diff --git a/8.0/alpine3.12/fpm/docker-php-source b/8.0/alpine3.14/fpm/docker-php-source similarity index 100% rename from 8.0/alpine3.12/fpm/docker-php-source rename to 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 index e54e5c39..4e1a248d 100644 --- a/8.1-rc/alpine3.13/cli/Dockerfile +++ b/8.1-rc/alpine3.13/cli/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/8.1-rc/alpine3.13/fpm/Dockerfile b/8.1-rc/alpine3.13/fpm/Dockerfile index 323a95d3..185621d7 100644 --- a/8.1-rc/alpine3.13/fpm/Dockerfile +++ b/8.1-rc/alpine3.13/fpm/Dockerfile @@ -33,9 +33,9 @@ RUN set -eux; \ 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/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; \ diff --git a/8.1-rc/alpine3.12/cli/Dockerfile b/8.1-rc/alpine3.14/cli/Dockerfile similarity index 98% rename from 8.1-rc/alpine3.12/cli/Dockerfile rename to 8.1-rc/alpine3.14/cli/Dockerfile index 49927da8..24494ff9 100644 --- a/8.1-rc/alpine3.12/cli/Dockerfile +++ b/8.1-rc/alpine3.14/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/8.1-rc/alpine3.12/cli/docker-php-entrypoint b/8.1-rc/alpine3.14/cli/docker-php-entrypoint similarity index 100% rename from 8.1-rc/alpine3.12/cli/docker-php-entrypoint rename to 8.1-rc/alpine3.14/cli/docker-php-entrypoint diff --git a/8.1-rc/alpine3.12/cli/docker-php-ext-configure b/8.1-rc/alpine3.14/cli/docker-php-ext-configure similarity index 100% rename from 8.1-rc/alpine3.12/cli/docker-php-ext-configure rename to 8.1-rc/alpine3.14/cli/docker-php-ext-configure diff --git a/8.1-rc/alpine3.12/cli/docker-php-ext-enable b/8.1-rc/alpine3.14/cli/docker-php-ext-enable similarity index 100% rename from 8.1-rc/alpine3.12/cli/docker-php-ext-enable rename to 8.1-rc/alpine3.14/cli/docker-php-ext-enable diff --git a/8.1-rc/alpine3.12/cli/docker-php-ext-install b/8.1-rc/alpine3.14/cli/docker-php-ext-install similarity index 100% rename from 8.1-rc/alpine3.12/cli/docker-php-ext-install rename to 8.1-rc/alpine3.14/cli/docker-php-ext-install diff --git a/8.1-rc/alpine3.12/cli/docker-php-source b/8.1-rc/alpine3.14/cli/docker-php-source similarity index 100% rename from 8.1-rc/alpine3.12/cli/docker-php-source rename to 8.1-rc/alpine3.14/cli/docker-php-source diff --git a/8.1-rc/alpine3.12/fpm/Dockerfile b/8.1-rc/alpine3.14/fpm/Dockerfile similarity index 98% rename from 8.1-rc/alpine3.12/fpm/Dockerfile rename to 8.1-rc/alpine3.14/fpm/Dockerfile index ee733c7d..a9d45544 100644 --- a/8.1-rc/alpine3.12/fpm/Dockerfile +++ b/8.1-rc/alpine3.14/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -30,12 +30,11 @@ RUN apk add --no-cache \ # ensure www-data user exists RUN set -eux; \ - 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/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; \ diff --git a/8.1-rc/alpine3.12/fpm/docker-php-entrypoint b/8.1-rc/alpine3.14/fpm/docker-php-entrypoint similarity index 100% rename from 8.1-rc/alpine3.12/fpm/docker-php-entrypoint rename to 8.1-rc/alpine3.14/fpm/docker-php-entrypoint diff --git a/8.1-rc/alpine3.12/fpm/docker-php-ext-configure b/8.1-rc/alpine3.14/fpm/docker-php-ext-configure similarity index 100% rename from 8.1-rc/alpine3.12/fpm/docker-php-ext-configure rename to 8.1-rc/alpine3.14/fpm/docker-php-ext-configure diff --git a/8.1-rc/alpine3.12/fpm/docker-php-ext-enable b/8.1-rc/alpine3.14/fpm/docker-php-ext-enable similarity index 100% rename from 8.1-rc/alpine3.12/fpm/docker-php-ext-enable rename to 8.1-rc/alpine3.14/fpm/docker-php-ext-enable diff --git a/8.1-rc/alpine3.12/fpm/docker-php-ext-install b/8.1-rc/alpine3.14/fpm/docker-php-ext-install similarity index 100% rename from 8.1-rc/alpine3.12/fpm/docker-php-ext-install rename to 8.1-rc/alpine3.14/fpm/docker-php-ext-install diff --git a/8.1-rc/alpine3.12/fpm/docker-php-source b/8.1-rc/alpine3.14/fpm/docker-php-source similarity index 100% rename from 8.1-rc/alpine3.12/fpm/docker-php-source rename to 8.1-rc/alpine3.14/fpm/docker-php-source diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 18aba897..e0560b0f 100644 --- 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; \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 31f63234..9f9b494e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,7 +10,7 @@ defaultDebianSuite='buster' declare -A debianSuites=( #[7.4-rc]='buster' ) -defaultAlpineVersion='3.13' +defaultAlpineVersion='3.14' declare -A alpineVersions=( # /usr/src/php/ext/openssl/openssl.c:551:12: error: static declaration of 'RSA_set0_key' follows non-static declaration # https://github.com/docker-library/php/pull/702#issuecomment-413341743 diff --git a/versions.json b/versions.json index d60153f7..da049680 100644 --- a/versions.json +++ b/versions.json @@ -13,12 +13,12 @@ "stretch/apache", "stretch/fpm", "stretch/zts", + "alpine3.14/cli", + "alpine3.14/fpm", + "alpine3.14/zts", "alpine3.13/cli", "alpine3.13/fpm", - "alpine3.13/zts", - "alpine3.12/cli", - "alpine3.12/fpm", - "alpine3.12/zts" + "alpine3.13/zts" ], "version": "7.3.28" }, @@ -32,12 +32,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.14/cli", + "alpine3.14/fpm", + "alpine3.14/zts", "alpine3.13/cli", "alpine3.13/fpm", - "alpine3.13/zts", - "alpine3.12/cli", - "alpine3.12/fpm", - "alpine3.12/zts" + "alpine3.13/zts" ], "version": "7.4.20" }, @@ -51,10 +51,10 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.14/cli", + "alpine3.14/fpm", "alpine3.13/cli", - "alpine3.13/fpm", - "alpine3.12/cli", - "alpine3.12/fpm" + "alpine3.13/fpm" ], "version": "8.0.7" }, @@ -68,10 +68,10 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.14/cli", + "alpine3.14/fpm", "alpine3.13/cli", - "alpine3.13/fpm", - "alpine3.12/cli", - "alpine3.12/fpm" + "alpine3.13/fpm" ], "version": "8.1.0alpha1" } diff --git a/versions.sh b/versions.sh index b1350db9..684fb9b0 100755 --- a/versions.sh +++ b/versions.sh @@ -119,8 +119,8 @@ for version in "${versions[@]}"; do for suite in \ buster \ stretch \ + alpine3.14 \ alpine3.13 \ - alpine3.12 \ ; do for variant in cli apache fpm zts; do [ -d "$version/$suite/$variant" ] || continue @@ -131,12 +131,6 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion" - if [ "$fullVersion" = '8.0.2' ]; then - # https://bugs.php.net/bug.php?id=80711#1612456954 😬 - url+='?a=1' - ascUrl+='?a=1' - fi - export fullVersion url ascUrl sha256 gpgKey json="$( jq <<<"$json" -c \