From 8b6304d5b51fd89ee0743ebc8f5e1c8b05334f92 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 3 Dec 2025 17:44:43 +0100 Subject: [PATCH] Add Alpine 3.23 and drop 3.21 For PHP 8.1 instead keep 3.21 until EOL end this year --- 8.2/{alpine3.21 => alpine3.23}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.2/{alpine3.21 => alpine3.23}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.2/{alpine3.21 => alpine3.23}/zts/Dockerfile | 10 +++++- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.3/{alpine3.21 => alpine3.23}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.3/{alpine3.21 => alpine3.23}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.3/{alpine3.21 => alpine3.23}/zts/Dockerfile | 2 +- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.4/{alpine3.21 => alpine3.23}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.4/{alpine3.21 => alpine3.23}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.4/{alpine3.21 => alpine3.23}/zts/Dockerfile | 2 +- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.5/{alpine3.21 => alpine3.23}/cli/Dockerfile | 2 +- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.5/{alpine3.21 => alpine3.23}/fpm/Dockerfile | 2 +- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.5/{alpine3.21 => alpine3.23}/zts/Dockerfile | 2 +- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 versions.json | 32 +++++++++---------- versions.sh | 9 ++++++ 74 files changed, 45 insertions(+), 28 deletions(-) rename 8.2/{alpine3.21 => alpine3.23}/cli/Dockerfile (99%) rename 8.2/{alpine3.21 => alpine3.23}/cli/docker-php-entrypoint (100%) rename 8.2/{alpine3.21 => alpine3.23}/cli/docker-php-ext-configure (100%) rename 8.2/{alpine3.21 => alpine3.23}/cli/docker-php-ext-enable (100%) rename 8.2/{alpine3.21 => alpine3.23}/cli/docker-php-ext-install (100%) rename 8.2/{alpine3.21 => alpine3.23}/cli/docker-php-source (100%) rename 8.2/{alpine3.21 => alpine3.23}/fpm/Dockerfile (99%) rename 8.2/{alpine3.21 => alpine3.23}/fpm/docker-php-entrypoint (100%) rename 8.2/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-configure (100%) rename 8.2/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-enable (100%) rename 8.2/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-install (100%) rename 8.2/{alpine3.21 => alpine3.23}/fpm/docker-php-source (100%) rename 8.2/{alpine3.21 => alpine3.23}/zts/Dockerfile (92%) rename 8.2/{alpine3.21 => alpine3.23}/zts/docker-php-entrypoint (100%) rename 8.2/{alpine3.21 => alpine3.23}/zts/docker-php-ext-configure (100%) rename 8.2/{alpine3.21 => alpine3.23}/zts/docker-php-ext-enable (100%) rename 8.2/{alpine3.21 => alpine3.23}/zts/docker-php-ext-install (100%) rename 8.2/{alpine3.21 => alpine3.23}/zts/docker-php-source (100%) rename 8.3/{alpine3.21 => alpine3.23}/cli/Dockerfile (99%) rename 8.3/{alpine3.21 => alpine3.23}/cli/docker-php-entrypoint (100%) rename 8.3/{alpine3.21 => alpine3.23}/cli/docker-php-ext-configure (100%) rename 8.3/{alpine3.21 => alpine3.23}/cli/docker-php-ext-enable (100%) rename 8.3/{alpine3.21 => alpine3.23}/cli/docker-php-ext-install (100%) rename 8.3/{alpine3.21 => alpine3.23}/cli/docker-php-source (100%) rename 8.3/{alpine3.21 => alpine3.23}/fpm/Dockerfile (99%) rename 8.3/{alpine3.21 => alpine3.23}/fpm/docker-php-entrypoint (100%) rename 8.3/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-configure (100%) rename 8.3/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-enable (100%) rename 8.3/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-install (100%) rename 8.3/{alpine3.21 => alpine3.23}/fpm/docker-php-source (100%) rename 8.3/{alpine3.21 => alpine3.23}/zts/Dockerfile (99%) rename 8.3/{alpine3.21 => alpine3.23}/zts/docker-php-entrypoint (100%) rename 8.3/{alpine3.21 => alpine3.23}/zts/docker-php-ext-configure (100%) rename 8.3/{alpine3.21 => alpine3.23}/zts/docker-php-ext-enable (100%) rename 8.3/{alpine3.21 => alpine3.23}/zts/docker-php-ext-install (100%) rename 8.3/{alpine3.21 => alpine3.23}/zts/docker-php-source (100%) rename 8.4/{alpine3.21 => alpine3.23}/cli/Dockerfile (99%) rename 8.4/{alpine3.21 => alpine3.23}/cli/docker-php-entrypoint (100%) rename 8.4/{alpine3.21 => alpine3.23}/cli/docker-php-ext-configure (100%) rename 8.4/{alpine3.21 => alpine3.23}/cli/docker-php-ext-enable (100%) rename 8.4/{alpine3.21 => alpine3.23}/cli/docker-php-ext-install (100%) rename 8.4/{alpine3.21 => alpine3.23}/cli/docker-php-source (100%) rename 8.4/{alpine3.21 => alpine3.23}/fpm/Dockerfile (99%) rename 8.4/{alpine3.21 => alpine3.23}/fpm/docker-php-entrypoint (100%) rename 8.4/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-configure (100%) rename 8.4/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-enable (100%) rename 8.4/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-install (100%) rename 8.4/{alpine3.21 => alpine3.23}/fpm/docker-php-source (100%) rename 8.4/{alpine3.21 => alpine3.23}/zts/Dockerfile (99%) rename 8.4/{alpine3.21 => alpine3.23}/zts/docker-php-entrypoint (100%) rename 8.4/{alpine3.21 => alpine3.23}/zts/docker-php-ext-configure (100%) rename 8.4/{alpine3.21 => alpine3.23}/zts/docker-php-ext-enable (100%) rename 8.4/{alpine3.21 => alpine3.23}/zts/docker-php-ext-install (100%) rename 8.4/{alpine3.21 => alpine3.23}/zts/docker-php-source (100%) rename 8.5/{alpine3.21 => alpine3.23}/cli/Dockerfile (99%) rename 8.5/{alpine3.21 => alpine3.23}/cli/docker-php-entrypoint (100%) rename 8.5/{alpine3.21 => alpine3.23}/cli/docker-php-ext-configure (100%) rename 8.5/{alpine3.21 => alpine3.23}/cli/docker-php-ext-enable (100%) rename 8.5/{alpine3.21 => alpine3.23}/cli/docker-php-ext-install (100%) rename 8.5/{alpine3.21 => alpine3.23}/cli/docker-php-source (100%) rename 8.5/{alpine3.21 => alpine3.23}/fpm/Dockerfile (99%) rename 8.5/{alpine3.21 => alpine3.23}/fpm/docker-php-entrypoint (100%) rename 8.5/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-configure (100%) rename 8.5/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-enable (100%) rename 8.5/{alpine3.21 => alpine3.23}/fpm/docker-php-ext-install (100%) rename 8.5/{alpine3.21 => alpine3.23}/fpm/docker-php-source (100%) rename 8.5/{alpine3.21 => alpine3.23}/zts/Dockerfile (99%) rename 8.5/{alpine3.21 => alpine3.23}/zts/docker-php-entrypoint (100%) rename 8.5/{alpine3.21 => alpine3.23}/zts/docker-php-ext-configure (100%) rename 8.5/{alpine3.21 => alpine3.23}/zts/docker-php-ext-enable (100%) rename 8.5/{alpine3.21 => alpine3.23}/zts/docker-php-ext-install (100%) rename 8.5/{alpine3.21 => alpine3.23}/zts/docker-php-source (100%) diff --git a/8.2/alpine3.21/cli/Dockerfile b/8.2/alpine3.23/cli/Dockerfile similarity index 99% rename from 8.2/alpine3.21/cli/Dockerfile rename to 8.2/alpine3.23/cli/Dockerfile index 2686646b33..45016a870c 100644 --- a/8.2/alpine3.21/cli/Dockerfile +++ b/8.2/alpine3.23/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/cli/docker-php-entrypoint b/8.2/alpine3.23/cli/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.21/cli/docker-php-entrypoint rename to 8.2/alpine3.23/cli/docker-php-entrypoint diff --git a/8.2/alpine3.21/cli/docker-php-ext-configure b/8.2/alpine3.23/cli/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.21/cli/docker-php-ext-configure rename to 8.2/alpine3.23/cli/docker-php-ext-configure diff --git a/8.2/alpine3.21/cli/docker-php-ext-enable b/8.2/alpine3.23/cli/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.21/cli/docker-php-ext-enable rename to 8.2/alpine3.23/cli/docker-php-ext-enable diff --git a/8.2/alpine3.21/cli/docker-php-ext-install b/8.2/alpine3.23/cli/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.21/cli/docker-php-ext-install rename to 8.2/alpine3.23/cli/docker-php-ext-install diff --git a/8.2/alpine3.21/cli/docker-php-source b/8.2/alpine3.23/cli/docker-php-source similarity index 100% rename from 8.2/alpine3.21/cli/docker-php-source rename to 8.2/alpine3.23/cli/docker-php-source diff --git a/8.2/alpine3.21/fpm/Dockerfile b/8.2/alpine3.23/fpm/Dockerfile similarity index 99% rename from 8.2/alpine3.21/fpm/Dockerfile rename to 8.2/alpine3.23/fpm/Dockerfile index 2168394feb..5b68c2cdef 100644 --- a/8.2/alpine3.21/fpm/Dockerfile +++ b/8.2/alpine3.23/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/fpm/docker-php-entrypoint b/8.2/alpine3.23/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.21/fpm/docker-php-entrypoint rename to 8.2/alpine3.23/fpm/docker-php-entrypoint diff --git a/8.2/alpine3.21/fpm/docker-php-ext-configure b/8.2/alpine3.23/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.21/fpm/docker-php-ext-configure rename to 8.2/alpine3.23/fpm/docker-php-ext-configure diff --git a/8.2/alpine3.21/fpm/docker-php-ext-enable b/8.2/alpine3.23/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.21/fpm/docker-php-ext-enable rename to 8.2/alpine3.23/fpm/docker-php-ext-enable diff --git a/8.2/alpine3.21/fpm/docker-php-ext-install b/8.2/alpine3.23/fpm/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.21/fpm/docker-php-ext-install rename to 8.2/alpine3.23/fpm/docker-php-ext-install diff --git a/8.2/alpine3.21/fpm/docker-php-source b/8.2/alpine3.23/fpm/docker-php-source similarity index 100% rename from 8.2/alpine3.21/fpm/docker-php-source rename to 8.2/alpine3.23/fpm/docker-php-source diff --git a/8.2/alpine3.21/zts/Dockerfile b/8.2/alpine3.23/zts/Dockerfile similarity index 92% rename from 8.2/alpine3.21/zts/Dockerfile rename to 8.2/alpine3.23/zts/Dockerfile index ec9d2e5a78..2276572db8 100644 --- a/8.2/alpine3.21/zts/Dockerfile +++ b/8.2/alpine3.23/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -98,6 +98,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -115,6 +117,12 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ + # https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c" + # https://github.com/docker-library/php/pull/1580 + curl -fL 'https://github.com/php/php-src/commit/b3c8afe272a6919248986c703c2e1defc73ff707.patch?full_index=1' -o 18743.patch; \ + echo 'b334f73434c9732a4b27a42eb5d417e10df842e854c02a3e753b2479f8978bf5 *18743.patch' | sha256sum -c -; \ + filterdiff -x '*/NEWS' 18743.patch | patch -p1; \ + rm 18743.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/8.2/alpine3.21/zts/docker-php-entrypoint b/8.2/alpine3.23/zts/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.21/zts/docker-php-entrypoint rename to 8.2/alpine3.23/zts/docker-php-entrypoint diff --git a/8.2/alpine3.21/zts/docker-php-ext-configure b/8.2/alpine3.23/zts/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.21/zts/docker-php-ext-configure rename to 8.2/alpine3.23/zts/docker-php-ext-configure diff --git a/8.2/alpine3.21/zts/docker-php-ext-enable b/8.2/alpine3.23/zts/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.21/zts/docker-php-ext-enable rename to 8.2/alpine3.23/zts/docker-php-ext-enable diff --git a/8.2/alpine3.21/zts/docker-php-ext-install b/8.2/alpine3.23/zts/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.21/zts/docker-php-ext-install rename to 8.2/alpine3.23/zts/docker-php-ext-install diff --git a/8.2/alpine3.21/zts/docker-php-source b/8.2/alpine3.23/zts/docker-php-source similarity index 100% rename from 8.2/alpine3.21/zts/docker-php-source rename to 8.2/alpine3.23/zts/docker-php-source diff --git a/8.3/alpine3.21/cli/Dockerfile b/8.3/alpine3.23/cli/Dockerfile similarity index 99% rename from 8.3/alpine3.21/cli/Dockerfile rename to 8.3/alpine3.23/cli/Dockerfile index 962e42aaa9..4610597d71 100644 --- a/8.3/alpine3.21/cli/Dockerfile +++ b/8.3/alpine3.23/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/cli/docker-php-entrypoint b/8.3/alpine3.23/cli/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.21/cli/docker-php-entrypoint rename to 8.3/alpine3.23/cli/docker-php-entrypoint diff --git a/8.3/alpine3.21/cli/docker-php-ext-configure b/8.3/alpine3.23/cli/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.21/cli/docker-php-ext-configure rename to 8.3/alpine3.23/cli/docker-php-ext-configure diff --git a/8.3/alpine3.21/cli/docker-php-ext-enable b/8.3/alpine3.23/cli/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.21/cli/docker-php-ext-enable rename to 8.3/alpine3.23/cli/docker-php-ext-enable diff --git a/8.3/alpine3.21/cli/docker-php-ext-install b/8.3/alpine3.23/cli/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.21/cli/docker-php-ext-install rename to 8.3/alpine3.23/cli/docker-php-ext-install diff --git a/8.3/alpine3.21/cli/docker-php-source b/8.3/alpine3.23/cli/docker-php-source similarity index 100% rename from 8.3/alpine3.21/cli/docker-php-source rename to 8.3/alpine3.23/cli/docker-php-source diff --git a/8.3/alpine3.21/fpm/Dockerfile b/8.3/alpine3.23/fpm/Dockerfile similarity index 99% rename from 8.3/alpine3.21/fpm/Dockerfile rename to 8.3/alpine3.23/fpm/Dockerfile index aedcf433f6..a4e4e2de73 100644 --- a/8.3/alpine3.21/fpm/Dockerfile +++ b/8.3/alpine3.23/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/fpm/docker-php-entrypoint b/8.3/alpine3.23/fpm/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.21/fpm/docker-php-entrypoint rename to 8.3/alpine3.23/fpm/docker-php-entrypoint diff --git a/8.3/alpine3.21/fpm/docker-php-ext-configure b/8.3/alpine3.23/fpm/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.21/fpm/docker-php-ext-configure rename to 8.3/alpine3.23/fpm/docker-php-ext-configure diff --git a/8.3/alpine3.21/fpm/docker-php-ext-enable b/8.3/alpine3.23/fpm/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.21/fpm/docker-php-ext-enable rename to 8.3/alpine3.23/fpm/docker-php-ext-enable diff --git a/8.3/alpine3.21/fpm/docker-php-ext-install b/8.3/alpine3.23/fpm/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.21/fpm/docker-php-ext-install rename to 8.3/alpine3.23/fpm/docker-php-ext-install diff --git a/8.3/alpine3.21/fpm/docker-php-source b/8.3/alpine3.23/fpm/docker-php-source similarity index 100% rename from 8.3/alpine3.21/fpm/docker-php-source rename to 8.3/alpine3.23/fpm/docker-php-source diff --git a/8.3/alpine3.21/zts/Dockerfile b/8.3/alpine3.23/zts/Dockerfile similarity index 99% rename from 8.3/alpine3.21/zts/Dockerfile rename to 8.3/alpine3.23/zts/Dockerfile index 4e57a9b1c5..e6dea125bd 100644 --- a/8.3/alpine3.21/zts/Dockerfile +++ b/8.3/alpine3.23/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/zts/docker-php-entrypoint b/8.3/alpine3.23/zts/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.21/zts/docker-php-entrypoint rename to 8.3/alpine3.23/zts/docker-php-entrypoint diff --git a/8.3/alpine3.21/zts/docker-php-ext-configure b/8.3/alpine3.23/zts/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.21/zts/docker-php-ext-configure rename to 8.3/alpine3.23/zts/docker-php-ext-configure diff --git a/8.3/alpine3.21/zts/docker-php-ext-enable b/8.3/alpine3.23/zts/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.21/zts/docker-php-ext-enable rename to 8.3/alpine3.23/zts/docker-php-ext-enable diff --git a/8.3/alpine3.21/zts/docker-php-ext-install b/8.3/alpine3.23/zts/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.21/zts/docker-php-ext-install rename to 8.3/alpine3.23/zts/docker-php-ext-install diff --git a/8.3/alpine3.21/zts/docker-php-source b/8.3/alpine3.23/zts/docker-php-source similarity index 100% rename from 8.3/alpine3.21/zts/docker-php-source rename to 8.3/alpine3.23/zts/docker-php-source diff --git a/8.4/alpine3.21/cli/Dockerfile b/8.4/alpine3.23/cli/Dockerfile similarity index 99% rename from 8.4/alpine3.21/cli/Dockerfile rename to 8.4/alpine3.23/cli/Dockerfile index 2fce9088b7..fac64956f0 100644 --- a/8.4/alpine3.21/cli/Dockerfile +++ b/8.4/alpine3.23/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/cli/docker-php-entrypoint b/8.4/alpine3.23/cli/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.21/cli/docker-php-entrypoint rename to 8.4/alpine3.23/cli/docker-php-entrypoint diff --git a/8.4/alpine3.21/cli/docker-php-ext-configure b/8.4/alpine3.23/cli/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.21/cli/docker-php-ext-configure rename to 8.4/alpine3.23/cli/docker-php-ext-configure diff --git a/8.4/alpine3.21/cli/docker-php-ext-enable b/8.4/alpine3.23/cli/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.21/cli/docker-php-ext-enable rename to 8.4/alpine3.23/cli/docker-php-ext-enable diff --git a/8.4/alpine3.21/cli/docker-php-ext-install b/8.4/alpine3.23/cli/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.21/cli/docker-php-ext-install rename to 8.4/alpine3.23/cli/docker-php-ext-install diff --git a/8.4/alpine3.21/cli/docker-php-source b/8.4/alpine3.23/cli/docker-php-source similarity index 100% rename from 8.4/alpine3.21/cli/docker-php-source rename to 8.4/alpine3.23/cli/docker-php-source diff --git a/8.4/alpine3.21/fpm/Dockerfile b/8.4/alpine3.23/fpm/Dockerfile similarity index 99% rename from 8.4/alpine3.21/fpm/Dockerfile rename to 8.4/alpine3.23/fpm/Dockerfile index 0cc012c083..a4d8febdc7 100644 --- a/8.4/alpine3.21/fpm/Dockerfile +++ b/8.4/alpine3.23/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/fpm/docker-php-entrypoint b/8.4/alpine3.23/fpm/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.21/fpm/docker-php-entrypoint rename to 8.4/alpine3.23/fpm/docker-php-entrypoint diff --git a/8.4/alpine3.21/fpm/docker-php-ext-configure b/8.4/alpine3.23/fpm/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.21/fpm/docker-php-ext-configure rename to 8.4/alpine3.23/fpm/docker-php-ext-configure diff --git a/8.4/alpine3.21/fpm/docker-php-ext-enable b/8.4/alpine3.23/fpm/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.21/fpm/docker-php-ext-enable rename to 8.4/alpine3.23/fpm/docker-php-ext-enable diff --git a/8.4/alpine3.21/fpm/docker-php-ext-install b/8.4/alpine3.23/fpm/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.21/fpm/docker-php-ext-install rename to 8.4/alpine3.23/fpm/docker-php-ext-install diff --git a/8.4/alpine3.21/fpm/docker-php-source b/8.4/alpine3.23/fpm/docker-php-source similarity index 100% rename from 8.4/alpine3.21/fpm/docker-php-source rename to 8.4/alpine3.23/fpm/docker-php-source diff --git a/8.4/alpine3.21/zts/Dockerfile b/8.4/alpine3.23/zts/Dockerfile similarity index 99% rename from 8.4/alpine3.21/zts/Dockerfile rename to 8.4/alpine3.23/zts/Dockerfile index d750ef43f0..eef1e1aa00 100644 --- a/8.4/alpine3.21/zts/Dockerfile +++ b/8.4/alpine3.23/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # 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.21/zts/docker-php-entrypoint b/8.4/alpine3.23/zts/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.21/zts/docker-php-entrypoint rename to 8.4/alpine3.23/zts/docker-php-entrypoint diff --git a/8.4/alpine3.21/zts/docker-php-ext-configure b/8.4/alpine3.23/zts/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.21/zts/docker-php-ext-configure rename to 8.4/alpine3.23/zts/docker-php-ext-configure diff --git a/8.4/alpine3.21/zts/docker-php-ext-enable b/8.4/alpine3.23/zts/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.21/zts/docker-php-ext-enable rename to 8.4/alpine3.23/zts/docker-php-ext-enable diff --git a/8.4/alpine3.21/zts/docker-php-ext-install b/8.4/alpine3.23/zts/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.21/zts/docker-php-ext-install rename to 8.4/alpine3.23/zts/docker-php-ext-install diff --git a/8.4/alpine3.21/zts/docker-php-source b/8.4/alpine3.23/zts/docker-php-source similarity index 100% rename from 8.4/alpine3.21/zts/docker-php-source rename to 8.4/alpine3.23/zts/docker-php-source diff --git a/8.5/alpine3.21/cli/Dockerfile b/8.5/alpine3.23/cli/Dockerfile similarity index 99% rename from 8.5/alpine3.21/cli/Dockerfile rename to 8.5/alpine3.23/cli/Dockerfile index 1a530469ef..01db63ab4f 100644 --- a/8.5/alpine3.21/cli/Dockerfile +++ b/8.5/alpine3.23/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.5/alpine3.21/cli/docker-php-entrypoint b/8.5/alpine3.23/cli/docker-php-entrypoint similarity index 100% rename from 8.5/alpine3.21/cli/docker-php-entrypoint rename to 8.5/alpine3.23/cli/docker-php-entrypoint diff --git a/8.5/alpine3.21/cli/docker-php-ext-configure b/8.5/alpine3.23/cli/docker-php-ext-configure similarity index 100% rename from 8.5/alpine3.21/cli/docker-php-ext-configure rename to 8.5/alpine3.23/cli/docker-php-ext-configure diff --git a/8.5/alpine3.21/cli/docker-php-ext-enable b/8.5/alpine3.23/cli/docker-php-ext-enable similarity index 100% rename from 8.5/alpine3.21/cli/docker-php-ext-enable rename to 8.5/alpine3.23/cli/docker-php-ext-enable diff --git a/8.5/alpine3.21/cli/docker-php-ext-install b/8.5/alpine3.23/cli/docker-php-ext-install similarity index 100% rename from 8.5/alpine3.21/cli/docker-php-ext-install rename to 8.5/alpine3.23/cli/docker-php-ext-install diff --git a/8.5/alpine3.21/cli/docker-php-source b/8.5/alpine3.23/cli/docker-php-source similarity index 100% rename from 8.5/alpine3.21/cli/docker-php-source rename to 8.5/alpine3.23/cli/docker-php-source diff --git a/8.5/alpine3.21/fpm/Dockerfile b/8.5/alpine3.23/fpm/Dockerfile similarity index 99% rename from 8.5/alpine3.21/fpm/Dockerfile rename to 8.5/alpine3.23/fpm/Dockerfile index 22124d276f..5d48d68172 100644 --- a/8.5/alpine3.21/fpm/Dockerfile +++ b/8.5/alpine3.23/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.5/alpine3.21/fpm/docker-php-entrypoint b/8.5/alpine3.23/fpm/docker-php-entrypoint similarity index 100% rename from 8.5/alpine3.21/fpm/docker-php-entrypoint rename to 8.5/alpine3.23/fpm/docker-php-entrypoint diff --git a/8.5/alpine3.21/fpm/docker-php-ext-configure b/8.5/alpine3.23/fpm/docker-php-ext-configure similarity index 100% rename from 8.5/alpine3.21/fpm/docker-php-ext-configure rename to 8.5/alpine3.23/fpm/docker-php-ext-configure diff --git a/8.5/alpine3.21/fpm/docker-php-ext-enable b/8.5/alpine3.23/fpm/docker-php-ext-enable similarity index 100% rename from 8.5/alpine3.21/fpm/docker-php-ext-enable rename to 8.5/alpine3.23/fpm/docker-php-ext-enable diff --git a/8.5/alpine3.21/fpm/docker-php-ext-install b/8.5/alpine3.23/fpm/docker-php-ext-install similarity index 100% rename from 8.5/alpine3.21/fpm/docker-php-ext-install rename to 8.5/alpine3.23/fpm/docker-php-ext-install diff --git a/8.5/alpine3.21/fpm/docker-php-source b/8.5/alpine3.23/fpm/docker-php-source similarity index 100% rename from 8.5/alpine3.21/fpm/docker-php-source rename to 8.5/alpine3.23/fpm/docker-php-source diff --git a/8.5/alpine3.21/zts/Dockerfile b/8.5/alpine3.23/zts/Dockerfile similarity index 99% rename from 8.5/alpine3.21/zts/Dockerfile rename to 8.5/alpine3.23/zts/Dockerfile index 4a7cd42bc7..492943b0e1 100644 --- a/8.5/alpine3.21/zts/Dockerfile +++ b/8.5/alpine3.23/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.5/alpine3.21/zts/docker-php-entrypoint b/8.5/alpine3.23/zts/docker-php-entrypoint similarity index 100% rename from 8.5/alpine3.21/zts/docker-php-entrypoint rename to 8.5/alpine3.23/zts/docker-php-entrypoint diff --git a/8.5/alpine3.21/zts/docker-php-ext-configure b/8.5/alpine3.23/zts/docker-php-ext-configure similarity index 100% rename from 8.5/alpine3.21/zts/docker-php-ext-configure rename to 8.5/alpine3.23/zts/docker-php-ext-configure diff --git a/8.5/alpine3.21/zts/docker-php-ext-enable b/8.5/alpine3.23/zts/docker-php-ext-enable similarity index 100% rename from 8.5/alpine3.21/zts/docker-php-ext-enable rename to 8.5/alpine3.23/zts/docker-php-ext-enable diff --git a/8.5/alpine3.21/zts/docker-php-ext-install b/8.5/alpine3.23/zts/docker-php-ext-install similarity index 100% rename from 8.5/alpine3.21/zts/docker-php-ext-install rename to 8.5/alpine3.23/zts/docker-php-ext-install diff --git a/8.5/alpine3.21/zts/docker-php-source b/8.5/alpine3.23/zts/docker-php-source similarity index 100% rename from 8.5/alpine3.21/zts/docker-php-source rename to 8.5/alpine3.23/zts/docker-php-source diff --git a/versions.json b/versions.json index 791386c6f3..222a0a2068 100644 --- a/versions.json +++ b/versions.json @@ -36,12 +36,12 @@ "bookworm/apache", "bookworm/fpm", "bookworm/zts", + "alpine3.23/cli", + "alpine3.23/fpm", + "alpine3.23/zts", "alpine3.22/cli", "alpine3.22/fpm", - "alpine3.22/zts", - "alpine3.21/cli", - "alpine3.21/fpm", - "alpine3.21/zts" + "alpine3.22/zts" ] }, "8.2-rc": null, @@ -59,12 +59,12 @@ "bookworm/apache", "bookworm/fpm", "bookworm/zts", + "alpine3.23/cli", + "alpine3.23/fpm", + "alpine3.23/zts", "alpine3.22/cli", "alpine3.22/fpm", - "alpine3.22/zts", - "alpine3.21/cli", - "alpine3.21/fpm", - "alpine3.21/zts" + "alpine3.22/zts" ] }, "8.3-rc": null, @@ -82,12 +82,12 @@ "bookworm/apache", "bookworm/fpm", "bookworm/zts", + "alpine3.23/cli", + "alpine3.23/fpm", + "alpine3.23/zts", "alpine3.22/cli", "alpine3.22/fpm", - "alpine3.22/zts", - "alpine3.21/cli", - "alpine3.21/fpm", - "alpine3.21/zts" + "alpine3.22/zts" ] }, "8.4-rc": null, @@ -105,12 +105,12 @@ "bookworm/apache", "bookworm/fpm", "bookworm/zts", + "alpine3.23/cli", + "alpine3.23/fpm", + "alpine3.23/zts", "alpine3.22/cli", "alpine3.22/fpm", - "alpine3.22/zts", - "alpine3.21/cli", - "alpine3.21/fpm", - "alpine3.21/zts" + "alpine3.22/zts" ] }, "8.5-rc": null diff --git a/versions.sh b/versions.sh index 02a790629a..2caffffe0d 100755 --- a/versions.sh +++ b/versions.sh @@ -82,6 +82,7 @@ for version in "${versions[@]}"; do for suite in \ trixie \ bookworm \ + alpine3.23 \ alpine3.22 \ alpine3.21 \ ; do @@ -90,6 +91,14 @@ for version in "${versions[@]}"; do if [ "$variant" = 'apache' ]; then continue fi + if [[ "$rcVersion" = '8.1' ]] && [[ "$suite" = 'alpine3.23' ]]; then + # Keep PHP 8.1 with Alpine 3.21 default until end of year; see also https://github.com/docker-library/php/blob/9ab2e4b37addffaa10f06d9e5f54f7bd1f5ef18f/generate-stackbrew-library.sh#L120 + continue + fi + if [[ "$rcVersion" != '8.1' ]] && [[ "$suite" = 'alpine3.21' ]]; then + # Keep Alpine 3.21 just for 8.1 + continue + fi fi export suite variant variants="$(jq <<<"$variants" -c '. + [ env.suite + "/" + env.variant ]')"