diff --git a/8.1/alpine3.20/cli/Dockerfile b/8.1/alpine3.20/cli/Dockerfile index d5d1f25c0..23c077e60 100644 --- a/8.1/alpine3.20/cli/Dockerfile +++ b/8.1/alpine3.20/cli/Dockerfile @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,17 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.1/alpine3.20/fpm/Dockerfile b/8.1/alpine3.20/fpm/Dockerfile index 846a3a724..8093d1145 100644 --- a/8.1/alpine3.20/fpm/Dockerfile +++ b/8.1/alpine3.20/fpm/Dockerfile @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,17 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.1/alpine3.20/zts/Dockerfile b/8.1/alpine3.20/zts/Dockerfile index b48e30bcd..9efedf1a9 100644 --- a/8.1/alpine3.20/zts/Dockerfile +++ b/8.1/alpine3.20/zts/Dockerfile @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,17 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.1/alpine3.19/cli/Dockerfile b/8.1/alpine3.21/cli/Dockerfile similarity index 89% rename from 8.1/alpine3.19/cli/Dockerfile rename to 8.1/alpine3.21/cli/Dockerfile index 3849988ca..755cd669d 100644 --- a/8.1/alpine3.19/cli/Dockerfile +++ b/8.1/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,17 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.1/alpine3.19/cli/docker-php-entrypoint b/8.1/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.19/cli/docker-php-entrypoint rename to 8.1/alpine3.21/cli/docker-php-entrypoint diff --git a/8.1/alpine3.19/cli/docker-php-ext-configure b/8.1/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.19/cli/docker-php-ext-configure rename to 8.1/alpine3.21/cli/docker-php-ext-configure diff --git a/8.1/alpine3.19/cli/docker-php-ext-enable b/8.1/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.19/cli/docker-php-ext-enable rename to 8.1/alpine3.21/cli/docker-php-ext-enable diff --git a/8.1/alpine3.19/cli/docker-php-ext-install b/8.1/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.19/cli/docker-php-ext-install rename to 8.1/alpine3.21/cli/docker-php-ext-install diff --git a/8.1/alpine3.19/cli/docker-php-source b/8.1/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.1/alpine3.19/cli/docker-php-source rename to 8.1/alpine3.21/cli/docker-php-source diff --git a/8.1/alpine3.19/fpm/Dockerfile b/8.1/alpine3.21/fpm/Dockerfile similarity index 91% rename from 8.1/alpine3.19/fpm/Dockerfile rename to 8.1/alpine3.21/fpm/Dockerfile index 7e5596b9e..a496a7802 100644 --- a/8.1/alpine3.19/fpm/Dockerfile +++ b/8.1/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,17 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.1/alpine3.19/fpm/docker-php-entrypoint b/8.1/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.19/fpm/docker-php-entrypoint rename to 8.1/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.1/alpine3.19/fpm/docker-php-ext-configure b/8.1/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.19/fpm/docker-php-ext-configure rename to 8.1/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.1/alpine3.19/fpm/docker-php-ext-enable b/8.1/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.19/fpm/docker-php-ext-enable rename to 8.1/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.1/alpine3.19/fpm/docker-php-ext-install b/8.1/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.19/fpm/docker-php-ext-install rename to 8.1/alpine3.21/fpm/docker-php-ext-install diff --git a/8.1/alpine3.19/fpm/docker-php-source b/8.1/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.1/alpine3.19/fpm/docker-php-source rename to 8.1/alpine3.21/fpm/docker-php-source diff --git a/8.1/alpine3.19/zts/Dockerfile b/8.1/alpine3.21/zts/Dockerfile similarity index 89% rename from 8.1/alpine3.19/zts/Dockerfile rename to 8.1/alpine3.21/zts/Dockerfile index bc49cf872..d69d8d91f 100644 --- a/8.1/alpine3.19/zts/Dockerfile +++ b/8.1/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,17 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.1/alpine3.19/zts/docker-php-entrypoint b/8.1/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.19/zts/docker-php-entrypoint rename to 8.1/alpine3.21/zts/docker-php-entrypoint diff --git a/8.1/alpine3.19/zts/docker-php-ext-configure b/8.1/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.19/zts/docker-php-ext-configure rename to 8.1/alpine3.21/zts/docker-php-ext-configure diff --git a/8.1/alpine3.19/zts/docker-php-ext-enable b/8.1/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.19/zts/docker-php-ext-enable rename to 8.1/alpine3.21/zts/docker-php-ext-enable diff --git a/8.1/alpine3.19/zts/docker-php-ext-install b/8.1/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.19/zts/docker-php-ext-install rename to 8.1/alpine3.21/zts/docker-php-ext-install diff --git a/8.1/alpine3.19/zts/docker-php-source b/8.1/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.1/alpine3.19/zts/docker-php-source rename to 8.1/alpine3.21/zts/docker-php-source diff --git a/8.2-rc/alpine3.19/cli/Dockerfile b/8.2-rc/alpine3.21/cli/Dockerfile similarity index 99% rename from 8.2-rc/alpine3.19/cli/Dockerfile rename to 8.2-rc/alpine3.21/cli/Dockerfile index debd7c2db..2c619cb49 100644 --- a/8.2-rc/alpine3.19/cli/Dockerfile +++ b/8.2-rc/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.2-rc/alpine3.19/cli/docker-php-entrypoint b/8.2-rc/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.2-rc/alpine3.19/cli/docker-php-entrypoint rename to 8.2-rc/alpine3.21/cli/docker-php-entrypoint diff --git a/8.2-rc/alpine3.19/cli/docker-php-ext-configure b/8.2-rc/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.2-rc/alpine3.19/cli/docker-php-ext-configure rename to 8.2-rc/alpine3.21/cli/docker-php-ext-configure diff --git a/8.2-rc/alpine3.19/cli/docker-php-ext-enable b/8.2-rc/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.2-rc/alpine3.19/cli/docker-php-ext-enable rename to 8.2-rc/alpine3.21/cli/docker-php-ext-enable diff --git a/8.2-rc/alpine3.19/cli/docker-php-ext-install b/8.2-rc/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.2-rc/alpine3.19/cli/docker-php-ext-install rename to 8.2-rc/alpine3.21/cli/docker-php-ext-install diff --git a/8.2-rc/alpine3.19/cli/docker-php-source b/8.2-rc/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.2-rc/alpine3.19/cli/docker-php-source rename to 8.2-rc/alpine3.21/cli/docker-php-source diff --git a/8.2-rc/alpine3.19/fpm/Dockerfile b/8.2-rc/alpine3.21/fpm/Dockerfile similarity index 99% rename from 8.2-rc/alpine3.19/fpm/Dockerfile rename to 8.2-rc/alpine3.21/fpm/Dockerfile index 7dfa19066..7aae9b312 100644 --- a/8.2-rc/alpine3.19/fpm/Dockerfile +++ b/8.2-rc/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.2-rc/alpine3.19/fpm/docker-php-entrypoint b/8.2-rc/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.2-rc/alpine3.19/fpm/docker-php-entrypoint rename to 8.2-rc/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.2-rc/alpine3.19/fpm/docker-php-ext-configure b/8.2-rc/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.2-rc/alpine3.19/fpm/docker-php-ext-configure rename to 8.2-rc/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.2-rc/alpine3.19/fpm/docker-php-ext-enable b/8.2-rc/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.2-rc/alpine3.19/fpm/docker-php-ext-enable rename to 8.2-rc/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.2-rc/alpine3.19/fpm/docker-php-ext-install b/8.2-rc/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.2-rc/alpine3.19/fpm/docker-php-ext-install rename to 8.2-rc/alpine3.21/fpm/docker-php-ext-install diff --git a/8.2-rc/alpine3.19/fpm/docker-php-source b/8.2-rc/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.2-rc/alpine3.19/fpm/docker-php-source rename to 8.2-rc/alpine3.21/fpm/docker-php-source diff --git a/8.2-rc/alpine3.19/zts/Dockerfile b/8.2-rc/alpine3.21/zts/Dockerfile similarity index 99% rename from 8.2-rc/alpine3.19/zts/Dockerfile rename to 8.2-rc/alpine3.21/zts/Dockerfile index 48a09c79f..61b13b6a6 100644 --- a/8.2-rc/alpine3.19/zts/Dockerfile +++ b/8.2-rc/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.2-rc/alpine3.19/zts/docker-php-entrypoint b/8.2-rc/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.2-rc/alpine3.19/zts/docker-php-entrypoint rename to 8.2-rc/alpine3.21/zts/docker-php-entrypoint diff --git a/8.2-rc/alpine3.19/zts/docker-php-ext-configure b/8.2-rc/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.2-rc/alpine3.19/zts/docker-php-ext-configure rename to 8.2-rc/alpine3.21/zts/docker-php-ext-configure diff --git a/8.2-rc/alpine3.19/zts/docker-php-ext-enable b/8.2-rc/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.2-rc/alpine3.19/zts/docker-php-ext-enable rename to 8.2-rc/alpine3.21/zts/docker-php-ext-enable diff --git a/8.2-rc/alpine3.19/zts/docker-php-ext-install b/8.2-rc/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.2-rc/alpine3.19/zts/docker-php-ext-install rename to 8.2-rc/alpine3.21/zts/docker-php-ext-install diff --git a/8.2-rc/alpine3.19/zts/docker-php-source b/8.2-rc/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.2-rc/alpine3.19/zts/docker-php-source rename to 8.2-rc/alpine3.21/zts/docker-php-source diff --git a/8.2/alpine3.19/cli/Dockerfile b/8.2/alpine3.21/cli/Dockerfile similarity index 99% rename from 8.2/alpine3.19/cli/Dockerfile rename to 8.2/alpine3.21/cli/Dockerfile index 3892b2bdd..817ece48b 100644 --- a/8.2/alpine3.19/cli/Dockerfile +++ b/8.2/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.2/alpine3.19/cli/docker-php-entrypoint b/8.2/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.19/cli/docker-php-entrypoint rename to 8.2/alpine3.21/cli/docker-php-entrypoint diff --git a/8.2/alpine3.19/cli/docker-php-ext-configure b/8.2/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.19/cli/docker-php-ext-configure rename to 8.2/alpine3.21/cli/docker-php-ext-configure diff --git a/8.2/alpine3.19/cli/docker-php-ext-enable b/8.2/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.19/cli/docker-php-ext-enable rename to 8.2/alpine3.21/cli/docker-php-ext-enable diff --git a/8.2/alpine3.19/cli/docker-php-ext-install b/8.2/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.19/cli/docker-php-ext-install rename to 8.2/alpine3.21/cli/docker-php-ext-install diff --git a/8.2/alpine3.19/cli/docker-php-source b/8.2/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.2/alpine3.19/cli/docker-php-source rename to 8.2/alpine3.21/cli/docker-php-source diff --git a/8.2/alpine3.19/fpm/Dockerfile b/8.2/alpine3.21/fpm/Dockerfile similarity index 99% rename from 8.2/alpine3.19/fpm/Dockerfile rename to 8.2/alpine3.21/fpm/Dockerfile index 6d3fc2ee6..5c7360240 100644 --- a/8.2/alpine3.19/fpm/Dockerfile +++ b/8.2/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.2/alpine3.19/fpm/docker-php-entrypoint b/8.2/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.19/fpm/docker-php-entrypoint rename to 8.2/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.2/alpine3.19/fpm/docker-php-ext-configure b/8.2/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.19/fpm/docker-php-ext-configure rename to 8.2/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.2/alpine3.19/fpm/docker-php-ext-enable b/8.2/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.19/fpm/docker-php-ext-enable rename to 8.2/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.2/alpine3.19/fpm/docker-php-ext-install b/8.2/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.19/fpm/docker-php-ext-install rename to 8.2/alpine3.21/fpm/docker-php-ext-install diff --git a/8.2/alpine3.19/fpm/docker-php-source b/8.2/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.2/alpine3.19/fpm/docker-php-source rename to 8.2/alpine3.21/fpm/docker-php-source diff --git a/8.2/alpine3.19/zts/Dockerfile b/8.2/alpine3.21/zts/Dockerfile similarity index 99% rename from 8.2/alpine3.19/zts/Dockerfile rename to 8.2/alpine3.21/zts/Dockerfile index 3f7e6b14b..5eacd416a 100644 --- a/8.2/alpine3.19/zts/Dockerfile +++ b/8.2/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.2/alpine3.19/zts/docker-php-entrypoint b/8.2/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.19/zts/docker-php-entrypoint rename to 8.2/alpine3.21/zts/docker-php-entrypoint diff --git a/8.2/alpine3.19/zts/docker-php-ext-configure b/8.2/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.19/zts/docker-php-ext-configure rename to 8.2/alpine3.21/zts/docker-php-ext-configure diff --git a/8.2/alpine3.19/zts/docker-php-ext-enable b/8.2/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.19/zts/docker-php-ext-enable rename to 8.2/alpine3.21/zts/docker-php-ext-enable diff --git a/8.2/alpine3.19/zts/docker-php-ext-install b/8.2/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.19/zts/docker-php-ext-install rename to 8.2/alpine3.21/zts/docker-php-ext-install diff --git a/8.2/alpine3.19/zts/docker-php-source b/8.2/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.2/alpine3.19/zts/docker-php-source rename to 8.2/alpine3.21/zts/docker-php-source diff --git a/8.3-rc/alpine3.19/cli/Dockerfile b/8.3-rc/alpine3.21/cli/Dockerfile similarity index 99% rename from 8.3-rc/alpine3.19/cli/Dockerfile rename to 8.3-rc/alpine3.21/cli/Dockerfile index a817f1e83..2f971d46f 100644 --- a/8.3-rc/alpine3.19/cli/Dockerfile +++ b/8.3-rc/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.3-rc/alpine3.19/cli/docker-php-entrypoint b/8.3-rc/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.3-rc/alpine3.19/cli/docker-php-entrypoint rename to 8.3-rc/alpine3.21/cli/docker-php-entrypoint diff --git a/8.3-rc/alpine3.19/cli/docker-php-ext-configure b/8.3-rc/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.3-rc/alpine3.19/cli/docker-php-ext-configure rename to 8.3-rc/alpine3.21/cli/docker-php-ext-configure diff --git a/8.3-rc/alpine3.19/cli/docker-php-ext-enable b/8.3-rc/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.3-rc/alpine3.19/cli/docker-php-ext-enable rename to 8.3-rc/alpine3.21/cli/docker-php-ext-enable diff --git a/8.3-rc/alpine3.19/cli/docker-php-ext-install b/8.3-rc/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.3-rc/alpine3.19/cli/docker-php-ext-install rename to 8.3-rc/alpine3.21/cli/docker-php-ext-install diff --git a/8.3-rc/alpine3.19/cli/docker-php-source b/8.3-rc/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.3-rc/alpine3.19/cli/docker-php-source rename to 8.3-rc/alpine3.21/cli/docker-php-source diff --git a/8.3-rc/alpine3.19/fpm/Dockerfile b/8.3-rc/alpine3.21/fpm/Dockerfile similarity index 99% rename from 8.3-rc/alpine3.19/fpm/Dockerfile rename to 8.3-rc/alpine3.21/fpm/Dockerfile index d7084f3c8..af97dfc88 100644 --- a/8.3-rc/alpine3.19/fpm/Dockerfile +++ b/8.3-rc/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.3-rc/alpine3.19/fpm/docker-php-entrypoint b/8.3-rc/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.3-rc/alpine3.19/fpm/docker-php-entrypoint rename to 8.3-rc/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.3-rc/alpine3.19/fpm/docker-php-ext-configure b/8.3-rc/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.3-rc/alpine3.19/fpm/docker-php-ext-configure rename to 8.3-rc/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.3-rc/alpine3.19/fpm/docker-php-ext-enable b/8.3-rc/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.3-rc/alpine3.19/fpm/docker-php-ext-enable rename to 8.3-rc/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.3-rc/alpine3.19/fpm/docker-php-ext-install b/8.3-rc/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.3-rc/alpine3.19/fpm/docker-php-ext-install rename to 8.3-rc/alpine3.21/fpm/docker-php-ext-install diff --git a/8.3-rc/alpine3.19/fpm/docker-php-source b/8.3-rc/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.3-rc/alpine3.19/fpm/docker-php-source rename to 8.3-rc/alpine3.21/fpm/docker-php-source diff --git a/8.3-rc/alpine3.19/zts/Dockerfile b/8.3-rc/alpine3.21/zts/Dockerfile similarity index 99% rename from 8.3-rc/alpine3.19/zts/Dockerfile rename to 8.3-rc/alpine3.21/zts/Dockerfile index c5a9d7eee..08f830bda 100644 --- a/8.3-rc/alpine3.19/zts/Dockerfile +++ b/8.3-rc/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.3-rc/alpine3.19/zts/docker-php-entrypoint b/8.3-rc/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.3-rc/alpine3.19/zts/docker-php-entrypoint rename to 8.3-rc/alpine3.21/zts/docker-php-entrypoint diff --git a/8.3-rc/alpine3.19/zts/docker-php-ext-configure b/8.3-rc/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.3-rc/alpine3.19/zts/docker-php-ext-configure rename to 8.3-rc/alpine3.21/zts/docker-php-ext-configure diff --git a/8.3-rc/alpine3.19/zts/docker-php-ext-enable b/8.3-rc/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.3-rc/alpine3.19/zts/docker-php-ext-enable rename to 8.3-rc/alpine3.21/zts/docker-php-ext-enable diff --git a/8.3-rc/alpine3.19/zts/docker-php-ext-install b/8.3-rc/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.3-rc/alpine3.19/zts/docker-php-ext-install rename to 8.3-rc/alpine3.21/zts/docker-php-ext-install diff --git a/8.3-rc/alpine3.19/zts/docker-php-source b/8.3-rc/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.3-rc/alpine3.19/zts/docker-php-source rename to 8.3-rc/alpine3.21/zts/docker-php-source diff --git a/8.3/alpine3.19/cli/Dockerfile b/8.3/alpine3.21/cli/Dockerfile similarity index 99% rename from 8.3/alpine3.19/cli/Dockerfile rename to 8.3/alpine3.21/cli/Dockerfile index db107f140..fe98c2846 100644 --- a/8.3/alpine3.19/cli/Dockerfile +++ b/8.3/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.3/alpine3.19/cli/docker-php-entrypoint b/8.3/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.19/cli/docker-php-entrypoint rename to 8.3/alpine3.21/cli/docker-php-entrypoint diff --git a/8.3/alpine3.19/cli/docker-php-ext-configure b/8.3/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.19/cli/docker-php-ext-configure rename to 8.3/alpine3.21/cli/docker-php-ext-configure diff --git a/8.3/alpine3.19/cli/docker-php-ext-enable b/8.3/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.19/cli/docker-php-ext-enable rename to 8.3/alpine3.21/cli/docker-php-ext-enable diff --git a/8.3/alpine3.19/cli/docker-php-ext-install b/8.3/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.19/cli/docker-php-ext-install rename to 8.3/alpine3.21/cli/docker-php-ext-install diff --git a/8.3/alpine3.19/cli/docker-php-source b/8.3/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.3/alpine3.19/cli/docker-php-source rename to 8.3/alpine3.21/cli/docker-php-source diff --git a/8.3/alpine3.19/fpm/Dockerfile b/8.3/alpine3.21/fpm/Dockerfile similarity index 99% rename from 8.3/alpine3.19/fpm/Dockerfile rename to 8.3/alpine3.21/fpm/Dockerfile index 31edd9c7c..07325774f 100644 --- a/8.3/alpine3.19/fpm/Dockerfile +++ b/8.3/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.3/alpine3.19/fpm/docker-php-entrypoint b/8.3/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.19/fpm/docker-php-entrypoint rename to 8.3/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.3/alpine3.19/fpm/docker-php-ext-configure b/8.3/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.19/fpm/docker-php-ext-configure rename to 8.3/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.3/alpine3.19/fpm/docker-php-ext-enable b/8.3/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.19/fpm/docker-php-ext-enable rename to 8.3/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.3/alpine3.19/fpm/docker-php-ext-install b/8.3/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.19/fpm/docker-php-ext-install rename to 8.3/alpine3.21/fpm/docker-php-ext-install diff --git a/8.3/alpine3.19/fpm/docker-php-source b/8.3/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.3/alpine3.19/fpm/docker-php-source rename to 8.3/alpine3.21/fpm/docker-php-source diff --git a/8.3/alpine3.19/zts/Dockerfile b/8.3/alpine3.21/zts/Dockerfile similarity index 99% rename from 8.3/alpine3.19/zts/Dockerfile rename to 8.3/alpine3.21/zts/Dockerfile index 2b01f3a1b..23c61d93b 100644 --- a/8.3/alpine3.19/zts/Dockerfile +++ b/8.3/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.3/alpine3.19/zts/docker-php-entrypoint b/8.3/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.19/zts/docker-php-entrypoint rename to 8.3/alpine3.21/zts/docker-php-entrypoint diff --git a/8.3/alpine3.19/zts/docker-php-ext-configure b/8.3/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.19/zts/docker-php-ext-configure rename to 8.3/alpine3.21/zts/docker-php-ext-configure diff --git a/8.3/alpine3.19/zts/docker-php-ext-enable b/8.3/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.19/zts/docker-php-ext-enable rename to 8.3/alpine3.21/zts/docker-php-ext-enable diff --git a/8.3/alpine3.19/zts/docker-php-ext-install b/8.3/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.19/zts/docker-php-ext-install rename to 8.3/alpine3.21/zts/docker-php-ext-install diff --git a/8.3/alpine3.19/zts/docker-php-source b/8.3/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.3/alpine3.19/zts/docker-php-source rename to 8.3/alpine3.21/zts/docker-php-source diff --git a/8.4-rc/alpine3.19/cli/Dockerfile b/8.4-rc/alpine3.21/cli/Dockerfile similarity index 99% rename from 8.4-rc/alpine3.19/cli/Dockerfile rename to 8.4-rc/alpine3.21/cli/Dockerfile index ed140edcc..138dd7ffc 100644 --- a/8.4-rc/alpine3.19/cli/Dockerfile +++ b/8.4-rc/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.4-rc/alpine3.19/cli/docker-php-entrypoint b/8.4-rc/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.4-rc/alpine3.19/cli/docker-php-entrypoint rename to 8.4-rc/alpine3.21/cli/docker-php-entrypoint diff --git a/8.4-rc/alpine3.19/cli/docker-php-ext-configure b/8.4-rc/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.4-rc/alpine3.19/cli/docker-php-ext-configure rename to 8.4-rc/alpine3.21/cli/docker-php-ext-configure diff --git a/8.4-rc/alpine3.19/cli/docker-php-ext-enable b/8.4-rc/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.4-rc/alpine3.19/cli/docker-php-ext-enable rename to 8.4-rc/alpine3.21/cli/docker-php-ext-enable diff --git a/8.4-rc/alpine3.19/cli/docker-php-ext-install b/8.4-rc/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.4-rc/alpine3.19/cli/docker-php-ext-install rename to 8.4-rc/alpine3.21/cli/docker-php-ext-install diff --git a/8.4-rc/alpine3.19/cli/docker-php-source b/8.4-rc/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.4-rc/alpine3.19/cli/docker-php-source rename to 8.4-rc/alpine3.21/cli/docker-php-source diff --git a/8.4-rc/alpine3.19/fpm/Dockerfile b/8.4-rc/alpine3.21/fpm/Dockerfile similarity index 99% rename from 8.4-rc/alpine3.19/fpm/Dockerfile rename to 8.4-rc/alpine3.21/fpm/Dockerfile index 0ad5a3767..ee2c5eab9 100644 --- a/8.4-rc/alpine3.19/fpm/Dockerfile +++ b/8.4-rc/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.4-rc/alpine3.19/fpm/docker-php-entrypoint b/8.4-rc/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.4-rc/alpine3.19/fpm/docker-php-entrypoint rename to 8.4-rc/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.4-rc/alpine3.19/fpm/docker-php-ext-configure b/8.4-rc/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.4-rc/alpine3.19/fpm/docker-php-ext-configure rename to 8.4-rc/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.4-rc/alpine3.19/fpm/docker-php-ext-enable b/8.4-rc/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.4-rc/alpine3.19/fpm/docker-php-ext-enable rename to 8.4-rc/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.4-rc/alpine3.19/fpm/docker-php-ext-install b/8.4-rc/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.4-rc/alpine3.19/fpm/docker-php-ext-install rename to 8.4-rc/alpine3.21/fpm/docker-php-ext-install diff --git a/8.4-rc/alpine3.19/fpm/docker-php-source b/8.4-rc/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.4-rc/alpine3.19/fpm/docker-php-source rename to 8.4-rc/alpine3.21/fpm/docker-php-source diff --git a/8.4-rc/alpine3.19/zts/Dockerfile b/8.4-rc/alpine3.21/zts/Dockerfile similarity index 99% rename from 8.4-rc/alpine3.19/zts/Dockerfile rename to 8.4-rc/alpine3.21/zts/Dockerfile index 45e861326..ca37ec565 100644 --- a/8.4-rc/alpine3.19/zts/Dockerfile +++ b/8.4-rc/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.4-rc/alpine3.19/zts/docker-php-entrypoint b/8.4-rc/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.4-rc/alpine3.19/zts/docker-php-entrypoint rename to 8.4-rc/alpine3.21/zts/docker-php-entrypoint diff --git a/8.4-rc/alpine3.19/zts/docker-php-ext-configure b/8.4-rc/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.4-rc/alpine3.19/zts/docker-php-ext-configure rename to 8.4-rc/alpine3.21/zts/docker-php-ext-configure diff --git a/8.4-rc/alpine3.19/zts/docker-php-ext-enable b/8.4-rc/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.4-rc/alpine3.19/zts/docker-php-ext-enable rename to 8.4-rc/alpine3.21/zts/docker-php-ext-enable diff --git a/8.4-rc/alpine3.19/zts/docker-php-ext-install b/8.4-rc/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.4-rc/alpine3.19/zts/docker-php-ext-install rename to 8.4-rc/alpine3.21/zts/docker-php-ext-install diff --git a/8.4-rc/alpine3.19/zts/docker-php-source b/8.4-rc/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.4-rc/alpine3.19/zts/docker-php-source rename to 8.4-rc/alpine3.21/zts/docker-php-source diff --git a/8.4/alpine3.19/cli/Dockerfile b/8.4/alpine3.21/cli/Dockerfile similarity index 99% rename from 8.4/alpine3.19/cli/Dockerfile rename to 8.4/alpine3.21/cli/Dockerfile index d658b6e96..8ebf75f32 100644 --- a/8.4/alpine3.19/cli/Dockerfile +++ b/8.4/alpine3.21/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.4/alpine3.19/cli/docker-php-entrypoint b/8.4/alpine3.21/cli/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.19/cli/docker-php-entrypoint rename to 8.4/alpine3.21/cli/docker-php-entrypoint diff --git a/8.4/alpine3.19/cli/docker-php-ext-configure b/8.4/alpine3.21/cli/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.19/cli/docker-php-ext-configure rename to 8.4/alpine3.21/cli/docker-php-ext-configure diff --git a/8.4/alpine3.19/cli/docker-php-ext-enable b/8.4/alpine3.21/cli/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.19/cli/docker-php-ext-enable rename to 8.4/alpine3.21/cli/docker-php-ext-enable diff --git a/8.4/alpine3.19/cli/docker-php-ext-install b/8.4/alpine3.21/cli/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.19/cli/docker-php-ext-install rename to 8.4/alpine3.21/cli/docker-php-ext-install diff --git a/8.4/alpine3.19/cli/docker-php-source b/8.4/alpine3.21/cli/docker-php-source similarity index 100% rename from 8.4/alpine3.19/cli/docker-php-source rename to 8.4/alpine3.21/cli/docker-php-source diff --git a/8.4/alpine3.19/fpm/Dockerfile b/8.4/alpine3.21/fpm/Dockerfile similarity index 99% rename from 8.4/alpine3.19/fpm/Dockerfile rename to 8.4/alpine3.21/fpm/Dockerfile index c08d6440c..cc4fda4db 100644 --- a/8.4/alpine3.19/fpm/Dockerfile +++ b/8.4/alpine3.21/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.4/alpine3.19/fpm/docker-php-entrypoint b/8.4/alpine3.21/fpm/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.19/fpm/docker-php-entrypoint rename to 8.4/alpine3.21/fpm/docker-php-entrypoint diff --git a/8.4/alpine3.19/fpm/docker-php-ext-configure b/8.4/alpine3.21/fpm/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.19/fpm/docker-php-ext-configure rename to 8.4/alpine3.21/fpm/docker-php-ext-configure diff --git a/8.4/alpine3.19/fpm/docker-php-ext-enable b/8.4/alpine3.21/fpm/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.19/fpm/docker-php-ext-enable rename to 8.4/alpine3.21/fpm/docker-php-ext-enable diff --git a/8.4/alpine3.19/fpm/docker-php-ext-install b/8.4/alpine3.21/fpm/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.19/fpm/docker-php-ext-install rename to 8.4/alpine3.21/fpm/docker-php-ext-install diff --git a/8.4/alpine3.19/fpm/docker-php-source b/8.4/alpine3.21/fpm/docker-php-source similarity index 100% rename from 8.4/alpine3.19/fpm/docker-php-source rename to 8.4/alpine3.21/fpm/docker-php-source diff --git a/8.4/alpine3.19/zts/Dockerfile b/8.4/alpine3.21/zts/Dockerfile similarity index 99% rename from 8.4/alpine3.19/zts/Dockerfile rename to 8.4/alpine3.21/zts/Dockerfile index 49733644b..a7bd0c7a8 100644 --- a/8.4/alpine3.19/zts/Dockerfile +++ b/8.4/alpine3.21/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.4/alpine3.19/zts/docker-php-entrypoint b/8.4/alpine3.21/zts/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.19/zts/docker-php-entrypoint rename to 8.4/alpine3.21/zts/docker-php-entrypoint diff --git a/8.4/alpine3.19/zts/docker-php-ext-configure b/8.4/alpine3.21/zts/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.19/zts/docker-php-ext-configure rename to 8.4/alpine3.21/zts/docker-php-ext-configure diff --git a/8.4/alpine3.19/zts/docker-php-ext-enable b/8.4/alpine3.21/zts/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.19/zts/docker-php-ext-enable rename to 8.4/alpine3.21/zts/docker-php-ext-enable diff --git a/8.4/alpine3.19/zts/docker-php-ext-install b/8.4/alpine3.21/zts/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.19/zts/docker-php-ext-install rename to 8.4/alpine3.21/zts/docker-php-ext-install diff --git a/8.4/alpine3.19/zts/docker-php-source b/8.4/alpine3.21/zts/docker-php-source similarity index 100% rename from 8.4/alpine3.19/zts/docker-php-source rename to 8.4/alpine3.21/zts/docker-php-source diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index c1daa6cc7..4d423b8c1 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -261,6 +261,8 @@ RUN set -eux; \ "libsodium-dev", "libxml2-dev", "openssl-dev", + # https://github.com/docker-library/php/pull/1552 + if env.version | rtrimstr("-rc") == "8.1" then "patch", "patchutils" else empty end, "readline-dev", "sqlite-dev", # https://github.com/docker-library/php/issues/888 @@ -304,6 +306,19 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ +{{ if is_alpine and (env.version | rtrimstr("-rc") == "8.1") then ( -}} +# Apply patches; see https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 + curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \ + echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \ + patch -p1 < 11678.patch; \ + rm 11678.patch; \ + # https://github.com/php/php-src/issues/14834 + curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \ + echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ + rm 14834.patch; \ +{{ ) else "" end -}} gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ {{ if is_alpine then "" else ( -}} debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ diff --git a/versions.json b/versions.json index ad6065522..f9b062930 100644 --- a/versions.json +++ b/versions.json @@ -12,12 +12,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.1.31" }, @@ -35,12 +35,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.2.26" }, @@ -57,12 +57,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.2.27RC1" }, @@ -79,12 +79,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.3.14" }, @@ -101,12 +101,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.3.15RC1" }, @@ -123,12 +123,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.4.1" }, @@ -145,12 +145,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.21/cli", + "alpine3.21/fpm", + "alpine3.21/zts", "alpine3.20/cli", "alpine3.20/fpm", - "alpine3.20/zts", - "alpine3.19/cli", - "alpine3.19/fpm", - "alpine3.19/zts" + "alpine3.20/zts" ], "version": "8.4.2RC1" } diff --git a/versions.sh b/versions.sh index ef0703d45..678806657 100755 --- a/versions.sh +++ b/versions.sh @@ -87,8 +87,8 @@ for version in "${versions[@]}"; do for suite in \ bookworm \ bullseye \ + alpine3.21 \ alpine3.20 \ - alpine3.19 \ ; do for variant in cli apache fpm zts; do if [[ "$suite" = alpine* ]]; then