From 904a84a176cea22942566d52335794314c3b2aed Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 30 May 2025 13:57:27 -0700 Subject: [PATCH 1/2] Add Alpine 3.22 (remove Alpine 3.20) --- 8.1/{alpine3.20 => alpine3.22}/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.1/{alpine3.20 => alpine3.22}/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.1/{alpine3.20 => alpine3.22}/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.2/{alpine3.20 => alpine3.22}/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.20 => alpine3.22}/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.20 => alpine3.22}/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.3/{alpine3.20 => alpine3.22}/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.20 => alpine3.22}/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.20 => alpine3.22}/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.20 => alpine3.22}/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.20 => alpine3.22}/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.20 => alpine3.22}/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 | 2 +- 74 files changed, 29 insertions(+), 29 deletions(-) rename 8.1/{alpine3.20 => alpine3.22}/cli/Dockerfile (99%) rename 8.1/{alpine3.20 => alpine3.22}/cli/docker-php-entrypoint (100%) rename 8.1/{alpine3.20 => alpine3.22}/cli/docker-php-ext-configure (100%) rename 8.1/{alpine3.20 => alpine3.22}/cli/docker-php-ext-enable (100%) rename 8.1/{alpine3.20 => alpine3.22}/cli/docker-php-ext-install (100%) rename 8.1/{alpine3.20 => alpine3.22}/cli/docker-php-source (100%) rename 8.1/{alpine3.20 => alpine3.22}/fpm/Dockerfile (99%) rename 8.1/{alpine3.20 => alpine3.22}/fpm/docker-php-entrypoint (100%) rename 8.1/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-configure (100%) rename 8.1/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-enable (100%) rename 8.1/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-install (100%) rename 8.1/{alpine3.20 => alpine3.22}/fpm/docker-php-source (100%) rename 8.1/{alpine3.20 => alpine3.22}/zts/Dockerfile (99%) rename 8.1/{alpine3.20 => alpine3.22}/zts/docker-php-entrypoint (100%) rename 8.1/{alpine3.20 => alpine3.22}/zts/docker-php-ext-configure (100%) rename 8.1/{alpine3.20 => alpine3.22}/zts/docker-php-ext-enable (100%) rename 8.1/{alpine3.20 => alpine3.22}/zts/docker-php-ext-install (100%) rename 8.1/{alpine3.20 => alpine3.22}/zts/docker-php-source (100%) rename 8.2/{alpine3.20 => alpine3.22}/cli/Dockerfile (99%) rename 8.2/{alpine3.20 => alpine3.22}/cli/docker-php-entrypoint (100%) rename 8.2/{alpine3.20 => alpine3.22}/cli/docker-php-ext-configure (100%) rename 8.2/{alpine3.20 => alpine3.22}/cli/docker-php-ext-enable (100%) rename 8.2/{alpine3.20 => alpine3.22}/cli/docker-php-ext-install (100%) rename 8.2/{alpine3.20 => alpine3.22}/cli/docker-php-source (100%) rename 8.2/{alpine3.20 => alpine3.22}/fpm/Dockerfile (99%) rename 8.2/{alpine3.20 => alpine3.22}/fpm/docker-php-entrypoint (100%) rename 8.2/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-configure (100%) rename 8.2/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-enable (100%) rename 8.2/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-install (100%) rename 8.2/{alpine3.20 => alpine3.22}/fpm/docker-php-source (100%) rename 8.2/{alpine3.20 => alpine3.22}/zts/Dockerfile (99%) rename 8.2/{alpine3.20 => alpine3.22}/zts/docker-php-entrypoint (100%) rename 8.2/{alpine3.20 => alpine3.22}/zts/docker-php-ext-configure (100%) rename 8.2/{alpine3.20 => alpine3.22}/zts/docker-php-ext-enable (100%) rename 8.2/{alpine3.20 => alpine3.22}/zts/docker-php-ext-install (100%) rename 8.2/{alpine3.20 => alpine3.22}/zts/docker-php-source (100%) rename 8.3/{alpine3.20 => alpine3.22}/cli/Dockerfile (99%) rename 8.3/{alpine3.20 => alpine3.22}/cli/docker-php-entrypoint (100%) rename 8.3/{alpine3.20 => alpine3.22}/cli/docker-php-ext-configure (100%) rename 8.3/{alpine3.20 => alpine3.22}/cli/docker-php-ext-enable (100%) rename 8.3/{alpine3.20 => alpine3.22}/cli/docker-php-ext-install (100%) rename 8.3/{alpine3.20 => alpine3.22}/cli/docker-php-source (100%) rename 8.3/{alpine3.20 => alpine3.22}/fpm/Dockerfile (99%) rename 8.3/{alpine3.20 => alpine3.22}/fpm/docker-php-entrypoint (100%) rename 8.3/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-configure (100%) rename 8.3/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-enable (100%) rename 8.3/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-install (100%) rename 8.3/{alpine3.20 => alpine3.22}/fpm/docker-php-source (100%) rename 8.3/{alpine3.20 => alpine3.22}/zts/Dockerfile (99%) rename 8.3/{alpine3.20 => alpine3.22}/zts/docker-php-entrypoint (100%) rename 8.3/{alpine3.20 => alpine3.22}/zts/docker-php-ext-configure (100%) rename 8.3/{alpine3.20 => alpine3.22}/zts/docker-php-ext-enable (100%) rename 8.3/{alpine3.20 => alpine3.22}/zts/docker-php-ext-install (100%) rename 8.3/{alpine3.20 => alpine3.22}/zts/docker-php-source (100%) rename 8.4/{alpine3.20 => alpine3.22}/cli/Dockerfile (99%) rename 8.4/{alpine3.20 => alpine3.22}/cli/docker-php-entrypoint (100%) rename 8.4/{alpine3.20 => alpine3.22}/cli/docker-php-ext-configure (100%) rename 8.4/{alpine3.20 => alpine3.22}/cli/docker-php-ext-enable (100%) rename 8.4/{alpine3.20 => alpine3.22}/cli/docker-php-ext-install (100%) rename 8.4/{alpine3.20 => alpine3.22}/cli/docker-php-source (100%) rename 8.4/{alpine3.20 => alpine3.22}/fpm/Dockerfile (99%) rename 8.4/{alpine3.20 => alpine3.22}/fpm/docker-php-entrypoint (100%) rename 8.4/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-configure (100%) rename 8.4/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-enable (100%) rename 8.4/{alpine3.20 => alpine3.22}/fpm/docker-php-ext-install (100%) rename 8.4/{alpine3.20 => alpine3.22}/fpm/docker-php-source (100%) rename 8.4/{alpine3.20 => alpine3.22}/zts/Dockerfile (99%) rename 8.4/{alpine3.20 => alpine3.22}/zts/docker-php-entrypoint (100%) rename 8.4/{alpine3.20 => alpine3.22}/zts/docker-php-ext-configure (100%) rename 8.4/{alpine3.20 => alpine3.22}/zts/docker-php-ext-enable (100%) rename 8.4/{alpine3.20 => alpine3.22}/zts/docker-php-ext-install (100%) rename 8.4/{alpine3.20 => alpine3.22}/zts/docker-php-source (100%) diff --git a/8.1/alpine3.20/cli/Dockerfile b/8.1/alpine3.22/cli/Dockerfile similarity index 99% rename from 8.1/alpine3.20/cli/Dockerfile rename to 8.1/alpine3.22/cli/Dockerfile index 9c0f0636e1..c6271d30c6 100644 --- a/8.1/alpine3.20/cli/Dockerfile +++ b/8.1/alpine3.22/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.1/alpine3.20/cli/docker-php-entrypoint b/8.1/alpine3.22/cli/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.20/cli/docker-php-entrypoint rename to 8.1/alpine3.22/cli/docker-php-entrypoint diff --git a/8.1/alpine3.20/cli/docker-php-ext-configure b/8.1/alpine3.22/cli/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.20/cli/docker-php-ext-configure rename to 8.1/alpine3.22/cli/docker-php-ext-configure diff --git a/8.1/alpine3.20/cli/docker-php-ext-enable b/8.1/alpine3.22/cli/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.20/cli/docker-php-ext-enable rename to 8.1/alpine3.22/cli/docker-php-ext-enable diff --git a/8.1/alpine3.20/cli/docker-php-ext-install b/8.1/alpine3.22/cli/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.20/cli/docker-php-ext-install rename to 8.1/alpine3.22/cli/docker-php-ext-install diff --git a/8.1/alpine3.20/cli/docker-php-source b/8.1/alpine3.22/cli/docker-php-source similarity index 100% rename from 8.1/alpine3.20/cli/docker-php-source rename to 8.1/alpine3.22/cli/docker-php-source diff --git a/8.1/alpine3.20/fpm/Dockerfile b/8.1/alpine3.22/fpm/Dockerfile similarity index 99% rename from 8.1/alpine3.20/fpm/Dockerfile rename to 8.1/alpine3.22/fpm/Dockerfile index 0211935afe..89853a1079 100644 --- a/8.1/alpine3.20/fpm/Dockerfile +++ b/8.1/alpine3.22/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.1/alpine3.20/fpm/docker-php-entrypoint b/8.1/alpine3.22/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.20/fpm/docker-php-entrypoint rename to 8.1/alpine3.22/fpm/docker-php-entrypoint diff --git a/8.1/alpine3.20/fpm/docker-php-ext-configure b/8.1/alpine3.22/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.20/fpm/docker-php-ext-configure rename to 8.1/alpine3.22/fpm/docker-php-ext-configure diff --git a/8.1/alpine3.20/fpm/docker-php-ext-enable b/8.1/alpine3.22/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.20/fpm/docker-php-ext-enable rename to 8.1/alpine3.22/fpm/docker-php-ext-enable diff --git a/8.1/alpine3.20/fpm/docker-php-ext-install b/8.1/alpine3.22/fpm/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.20/fpm/docker-php-ext-install rename to 8.1/alpine3.22/fpm/docker-php-ext-install diff --git a/8.1/alpine3.20/fpm/docker-php-source b/8.1/alpine3.22/fpm/docker-php-source similarity index 100% rename from 8.1/alpine3.20/fpm/docker-php-source rename to 8.1/alpine3.22/fpm/docker-php-source diff --git a/8.1/alpine3.20/zts/Dockerfile b/8.1/alpine3.22/zts/Dockerfile similarity index 99% rename from 8.1/alpine3.20/zts/Dockerfile rename to 8.1/alpine3.22/zts/Dockerfile index 03bab09ace..d15855871d 100644 --- a/8.1/alpine3.20/zts/Dockerfile +++ b/8.1/alpine3.22/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.1/alpine3.20/zts/docker-php-entrypoint b/8.1/alpine3.22/zts/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.20/zts/docker-php-entrypoint rename to 8.1/alpine3.22/zts/docker-php-entrypoint diff --git a/8.1/alpine3.20/zts/docker-php-ext-configure b/8.1/alpine3.22/zts/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.20/zts/docker-php-ext-configure rename to 8.1/alpine3.22/zts/docker-php-ext-configure diff --git a/8.1/alpine3.20/zts/docker-php-ext-enable b/8.1/alpine3.22/zts/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.20/zts/docker-php-ext-enable rename to 8.1/alpine3.22/zts/docker-php-ext-enable diff --git a/8.1/alpine3.20/zts/docker-php-ext-install b/8.1/alpine3.22/zts/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.20/zts/docker-php-ext-install rename to 8.1/alpine3.22/zts/docker-php-ext-install diff --git a/8.1/alpine3.20/zts/docker-php-source b/8.1/alpine3.22/zts/docker-php-source similarity index 100% rename from 8.1/alpine3.20/zts/docker-php-source rename to 8.1/alpine3.22/zts/docker-php-source diff --git a/8.2/alpine3.20/cli/Dockerfile b/8.2/alpine3.22/cli/Dockerfile similarity index 99% rename from 8.2/alpine3.20/cli/Dockerfile rename to 8.2/alpine3.22/cli/Dockerfile index e057e1538d..6df54d8206 100644 --- a/8.2/alpine3.20/cli/Dockerfile +++ b/8.2/alpine3.22/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/cli/docker-php-entrypoint b/8.2/alpine3.22/cli/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.20/cli/docker-php-entrypoint rename to 8.2/alpine3.22/cli/docker-php-entrypoint diff --git a/8.2/alpine3.20/cli/docker-php-ext-configure b/8.2/alpine3.22/cli/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.20/cli/docker-php-ext-configure rename to 8.2/alpine3.22/cli/docker-php-ext-configure diff --git a/8.2/alpine3.20/cli/docker-php-ext-enable b/8.2/alpine3.22/cli/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.20/cli/docker-php-ext-enable rename to 8.2/alpine3.22/cli/docker-php-ext-enable diff --git a/8.2/alpine3.20/cli/docker-php-ext-install b/8.2/alpine3.22/cli/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.20/cli/docker-php-ext-install rename to 8.2/alpine3.22/cli/docker-php-ext-install diff --git a/8.2/alpine3.20/cli/docker-php-source b/8.2/alpine3.22/cli/docker-php-source similarity index 100% rename from 8.2/alpine3.20/cli/docker-php-source rename to 8.2/alpine3.22/cli/docker-php-source diff --git a/8.2/alpine3.20/fpm/Dockerfile b/8.2/alpine3.22/fpm/Dockerfile similarity index 99% rename from 8.2/alpine3.20/fpm/Dockerfile rename to 8.2/alpine3.22/fpm/Dockerfile index 27414f5b0d..fdcfe60ed0 100644 --- a/8.2/alpine3.20/fpm/Dockerfile +++ b/8.2/alpine3.22/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/fpm/docker-php-entrypoint b/8.2/alpine3.22/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.20/fpm/docker-php-entrypoint rename to 8.2/alpine3.22/fpm/docker-php-entrypoint diff --git a/8.2/alpine3.20/fpm/docker-php-ext-configure b/8.2/alpine3.22/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.20/fpm/docker-php-ext-configure rename to 8.2/alpine3.22/fpm/docker-php-ext-configure diff --git a/8.2/alpine3.20/fpm/docker-php-ext-enable b/8.2/alpine3.22/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.20/fpm/docker-php-ext-enable rename to 8.2/alpine3.22/fpm/docker-php-ext-enable diff --git a/8.2/alpine3.20/fpm/docker-php-ext-install b/8.2/alpine3.22/fpm/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.20/fpm/docker-php-ext-install rename to 8.2/alpine3.22/fpm/docker-php-ext-install diff --git a/8.2/alpine3.20/fpm/docker-php-source b/8.2/alpine3.22/fpm/docker-php-source similarity index 100% rename from 8.2/alpine3.20/fpm/docker-php-source rename to 8.2/alpine3.22/fpm/docker-php-source diff --git a/8.2/alpine3.20/zts/Dockerfile b/8.2/alpine3.22/zts/Dockerfile similarity index 99% rename from 8.2/alpine3.20/zts/Dockerfile rename to 8.2/alpine3.22/zts/Dockerfile index 101d6810a7..0072fba475 100644 --- a/8.2/alpine3.20/zts/Dockerfile +++ b/8.2/alpine3.22/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/zts/docker-php-entrypoint b/8.2/alpine3.22/zts/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.20/zts/docker-php-entrypoint rename to 8.2/alpine3.22/zts/docker-php-entrypoint diff --git a/8.2/alpine3.20/zts/docker-php-ext-configure b/8.2/alpine3.22/zts/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.20/zts/docker-php-ext-configure rename to 8.2/alpine3.22/zts/docker-php-ext-configure diff --git a/8.2/alpine3.20/zts/docker-php-ext-enable b/8.2/alpine3.22/zts/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.20/zts/docker-php-ext-enable rename to 8.2/alpine3.22/zts/docker-php-ext-enable diff --git a/8.2/alpine3.20/zts/docker-php-ext-install b/8.2/alpine3.22/zts/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.20/zts/docker-php-ext-install rename to 8.2/alpine3.22/zts/docker-php-ext-install diff --git a/8.2/alpine3.20/zts/docker-php-source b/8.2/alpine3.22/zts/docker-php-source similarity index 100% rename from 8.2/alpine3.20/zts/docker-php-source rename to 8.2/alpine3.22/zts/docker-php-source diff --git a/8.3/alpine3.20/cli/Dockerfile b/8.3/alpine3.22/cli/Dockerfile similarity index 99% rename from 8.3/alpine3.20/cli/Dockerfile rename to 8.3/alpine3.22/cli/Dockerfile index 4cfbc84a25..adad4cb233 100644 --- a/8.3/alpine3.20/cli/Dockerfile +++ b/8.3/alpine3.22/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/cli/docker-php-entrypoint b/8.3/alpine3.22/cli/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.20/cli/docker-php-entrypoint rename to 8.3/alpine3.22/cli/docker-php-entrypoint diff --git a/8.3/alpine3.20/cli/docker-php-ext-configure b/8.3/alpine3.22/cli/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.20/cli/docker-php-ext-configure rename to 8.3/alpine3.22/cli/docker-php-ext-configure diff --git a/8.3/alpine3.20/cli/docker-php-ext-enable b/8.3/alpine3.22/cli/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.20/cli/docker-php-ext-enable rename to 8.3/alpine3.22/cli/docker-php-ext-enable diff --git a/8.3/alpine3.20/cli/docker-php-ext-install b/8.3/alpine3.22/cli/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.20/cli/docker-php-ext-install rename to 8.3/alpine3.22/cli/docker-php-ext-install diff --git a/8.3/alpine3.20/cli/docker-php-source b/8.3/alpine3.22/cli/docker-php-source similarity index 100% rename from 8.3/alpine3.20/cli/docker-php-source rename to 8.3/alpine3.22/cli/docker-php-source diff --git a/8.3/alpine3.20/fpm/Dockerfile b/8.3/alpine3.22/fpm/Dockerfile similarity index 99% rename from 8.3/alpine3.20/fpm/Dockerfile rename to 8.3/alpine3.22/fpm/Dockerfile index 2e9d6fe498..1d280e5af5 100644 --- a/8.3/alpine3.20/fpm/Dockerfile +++ b/8.3/alpine3.22/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/fpm/docker-php-entrypoint b/8.3/alpine3.22/fpm/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.20/fpm/docker-php-entrypoint rename to 8.3/alpine3.22/fpm/docker-php-entrypoint diff --git a/8.3/alpine3.20/fpm/docker-php-ext-configure b/8.3/alpine3.22/fpm/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.20/fpm/docker-php-ext-configure rename to 8.3/alpine3.22/fpm/docker-php-ext-configure diff --git a/8.3/alpine3.20/fpm/docker-php-ext-enable b/8.3/alpine3.22/fpm/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.20/fpm/docker-php-ext-enable rename to 8.3/alpine3.22/fpm/docker-php-ext-enable diff --git a/8.3/alpine3.20/fpm/docker-php-ext-install b/8.3/alpine3.22/fpm/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.20/fpm/docker-php-ext-install rename to 8.3/alpine3.22/fpm/docker-php-ext-install diff --git a/8.3/alpine3.20/fpm/docker-php-source b/8.3/alpine3.22/fpm/docker-php-source similarity index 100% rename from 8.3/alpine3.20/fpm/docker-php-source rename to 8.3/alpine3.22/fpm/docker-php-source diff --git a/8.3/alpine3.20/zts/Dockerfile b/8.3/alpine3.22/zts/Dockerfile similarity index 99% rename from 8.3/alpine3.20/zts/Dockerfile rename to 8.3/alpine3.22/zts/Dockerfile index fc608749fc..8352917942 100644 --- a/8.3/alpine3.20/zts/Dockerfile +++ b/8.3/alpine3.22/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/zts/docker-php-entrypoint b/8.3/alpine3.22/zts/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.20/zts/docker-php-entrypoint rename to 8.3/alpine3.22/zts/docker-php-entrypoint diff --git a/8.3/alpine3.20/zts/docker-php-ext-configure b/8.3/alpine3.22/zts/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.20/zts/docker-php-ext-configure rename to 8.3/alpine3.22/zts/docker-php-ext-configure diff --git a/8.3/alpine3.20/zts/docker-php-ext-enable b/8.3/alpine3.22/zts/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.20/zts/docker-php-ext-enable rename to 8.3/alpine3.22/zts/docker-php-ext-enable diff --git a/8.3/alpine3.20/zts/docker-php-ext-install b/8.3/alpine3.22/zts/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.20/zts/docker-php-ext-install rename to 8.3/alpine3.22/zts/docker-php-ext-install diff --git a/8.3/alpine3.20/zts/docker-php-source b/8.3/alpine3.22/zts/docker-php-source similarity index 100% rename from 8.3/alpine3.20/zts/docker-php-source rename to 8.3/alpine3.22/zts/docker-php-source diff --git a/8.4/alpine3.20/cli/Dockerfile b/8.4/alpine3.22/cli/Dockerfile similarity index 99% rename from 8.4/alpine3.20/cli/Dockerfile rename to 8.4/alpine3.22/cli/Dockerfile index ef4dcb7486..2afa8f29fe 100644 --- a/8.4/alpine3.20/cli/Dockerfile +++ b/8.4/alpine3.22/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/cli/docker-php-entrypoint b/8.4/alpine3.22/cli/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.20/cli/docker-php-entrypoint rename to 8.4/alpine3.22/cli/docker-php-entrypoint diff --git a/8.4/alpine3.20/cli/docker-php-ext-configure b/8.4/alpine3.22/cli/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.20/cli/docker-php-ext-configure rename to 8.4/alpine3.22/cli/docker-php-ext-configure diff --git a/8.4/alpine3.20/cli/docker-php-ext-enable b/8.4/alpine3.22/cli/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.20/cli/docker-php-ext-enable rename to 8.4/alpine3.22/cli/docker-php-ext-enable diff --git a/8.4/alpine3.20/cli/docker-php-ext-install b/8.4/alpine3.22/cli/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.20/cli/docker-php-ext-install rename to 8.4/alpine3.22/cli/docker-php-ext-install diff --git a/8.4/alpine3.20/cli/docker-php-source b/8.4/alpine3.22/cli/docker-php-source similarity index 100% rename from 8.4/alpine3.20/cli/docker-php-source rename to 8.4/alpine3.22/cli/docker-php-source diff --git a/8.4/alpine3.20/fpm/Dockerfile b/8.4/alpine3.22/fpm/Dockerfile similarity index 99% rename from 8.4/alpine3.20/fpm/Dockerfile rename to 8.4/alpine3.22/fpm/Dockerfile index 15b4121b86..dd4932b68d 100644 --- a/8.4/alpine3.20/fpm/Dockerfile +++ b/8.4/alpine3.22/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/fpm/docker-php-entrypoint b/8.4/alpine3.22/fpm/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.20/fpm/docker-php-entrypoint rename to 8.4/alpine3.22/fpm/docker-php-entrypoint diff --git a/8.4/alpine3.20/fpm/docker-php-ext-configure b/8.4/alpine3.22/fpm/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.20/fpm/docker-php-ext-configure rename to 8.4/alpine3.22/fpm/docker-php-ext-configure diff --git a/8.4/alpine3.20/fpm/docker-php-ext-enable b/8.4/alpine3.22/fpm/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.20/fpm/docker-php-ext-enable rename to 8.4/alpine3.22/fpm/docker-php-ext-enable diff --git a/8.4/alpine3.20/fpm/docker-php-ext-install b/8.4/alpine3.22/fpm/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.20/fpm/docker-php-ext-install rename to 8.4/alpine3.22/fpm/docker-php-ext-install diff --git a/8.4/alpine3.20/fpm/docker-php-source b/8.4/alpine3.22/fpm/docker-php-source similarity index 100% rename from 8.4/alpine3.20/fpm/docker-php-source rename to 8.4/alpine3.22/fpm/docker-php-source diff --git a/8.4/alpine3.20/zts/Dockerfile b/8.4/alpine3.22/zts/Dockerfile similarity index 99% rename from 8.4/alpine3.20/zts/Dockerfile rename to 8.4/alpine3.22/zts/Dockerfile index dfde7fa397..93efed44d9 100644 --- a/8.4/alpine3.20/zts/Dockerfile +++ b/8.4/alpine3.22/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 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.20/zts/docker-php-entrypoint b/8.4/alpine3.22/zts/docker-php-entrypoint similarity index 100% rename from 8.4/alpine3.20/zts/docker-php-entrypoint rename to 8.4/alpine3.22/zts/docker-php-entrypoint diff --git a/8.4/alpine3.20/zts/docker-php-ext-configure b/8.4/alpine3.22/zts/docker-php-ext-configure similarity index 100% rename from 8.4/alpine3.20/zts/docker-php-ext-configure rename to 8.4/alpine3.22/zts/docker-php-ext-configure diff --git a/8.4/alpine3.20/zts/docker-php-ext-enable b/8.4/alpine3.22/zts/docker-php-ext-enable similarity index 100% rename from 8.4/alpine3.20/zts/docker-php-ext-enable rename to 8.4/alpine3.22/zts/docker-php-ext-enable diff --git a/8.4/alpine3.20/zts/docker-php-ext-install b/8.4/alpine3.22/zts/docker-php-ext-install similarity index 100% rename from 8.4/alpine3.20/zts/docker-php-ext-install rename to 8.4/alpine3.22/zts/docker-php-ext-install diff --git a/8.4/alpine3.20/zts/docker-php-source b/8.4/alpine3.22/zts/docker-php-source similarity index 100% rename from 8.4/alpine3.20/zts/docker-php-source rename to 8.4/alpine3.22/zts/docker-php-source diff --git a/versions.json b/versions.json index 941ad2e100..899f5f0220 100644 --- a/versions.json +++ b/versions.json @@ -13,12 +13,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.22/cli", + "alpine3.22/fpm", + "alpine3.22/zts", "alpine3.21/cli", "alpine3.21/fpm", - "alpine3.21/zts", - "alpine3.20/cli", - "alpine3.20/fpm", - "alpine3.20/zts" + "alpine3.21/zts" ] }, "8.1-rc": null, @@ -36,12 +36,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.22/cli", + "alpine3.22/fpm", + "alpine3.22/zts", "alpine3.21/cli", "alpine3.21/fpm", - "alpine3.21/zts", - "alpine3.20/cli", - "alpine3.20/fpm", - "alpine3.20/zts" + "alpine3.21/zts" ] }, "8.2-rc": null, @@ -59,12 +59,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.22/cli", + "alpine3.22/fpm", + "alpine3.22/zts", "alpine3.21/cli", "alpine3.21/fpm", - "alpine3.21/zts", - "alpine3.20/cli", - "alpine3.20/fpm", - "alpine3.20/zts" + "alpine3.21/zts" ] }, "8.3-rc": null, @@ -82,12 +82,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.22/cli", + "alpine3.22/fpm", + "alpine3.22/zts", "alpine3.21/cli", "alpine3.21/fpm", - "alpine3.21/zts", - "alpine3.20/cli", - "alpine3.20/fpm", - "alpine3.20/zts" + "alpine3.21/zts" ] }, "8.4-rc": null diff --git a/versions.sh b/versions.sh index bbe8cf2c3e..4535043326 100755 --- a/versions.sh +++ b/versions.sh @@ -82,8 +82,8 @@ for version in "${versions[@]}"; do for suite in \ bookworm \ bullseye \ + alpine3.22 \ alpine3.21 \ - alpine3.20 \ ; do for variant in cli apache fpm zts; do if [[ "$suite" = alpine* ]]; then From 9c90483c2bb64195cc9c55cb06a4830955015830 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 9 Jun 2025 15:07:45 -0700 Subject: [PATCH 2/2] Backport patches for Alpine 3.22 + ZTS --- 8.1/alpine3.22/zts/Dockerfile | 6 +++++ 8.2/alpine3.22/zts/Dockerfile | 8 ++++++ 8.3/alpine3.22/zts/Dockerfile | 8 ++++++ 8.4/alpine3.22/zts/Dockerfile | 8 ++++++ Dockerfile-linux.template | 51 ++++++++++++++++++++++++++++++----- 5 files changed, 74 insertions(+), 7 deletions(-) diff --git a/8.1/alpine3.22/zts/Dockerfile b/8.1/alpine3.22/zts/Dockerfile index d15855871d..168800df03 100644 --- a/8.1/alpine3.22/zts/Dockerfile +++ b/8.1/alpine3.22/zts/Dockerfile @@ -130,6 +130,12 @@ RUN set -eux; \ echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ + # 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/6b105d4bc57e20a2472c9a6ff11fba32768556d4.patch?full_index=1' -o 18743.patch; \ + echo '037e1610ae5d444e9a8c3ecd9d5f0cd215fd0aac90bdd7b9f0b259bffdf3566b *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.22/zts/Dockerfile b/8.2/alpine3.22/zts/Dockerfile index 0072fba475..093218036e 100644 --- a/8.2/alpine3.22/zts/Dockerfile +++ b/8.2/alpine3.22/zts/Dockerfile @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,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.3/alpine3.22/zts/Dockerfile b/8.3/alpine3.22/zts/Dockerfile index 8352917942..816d9d495d 100644 --- a/8.3/alpine3.22/zts/Dockerfile +++ b/8.3/alpine3.22/zts/Dockerfile @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,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.4/alpine3.22/zts/Dockerfile b/8.4/alpine3.22/zts/Dockerfile index 93efed44d9..f51a98bc2e 100644 --- a/8.4/alpine3.22/zts/Dockerfile +++ b/8.4/alpine3.22/zts/Dockerfile @@ -100,6 +100,8 @@ RUN set -eux; \ linux-headers \ oniguruma-dev \ openssl-dev \ + patch \ + patchutils \ readline-dev \ sqlite-dev \ ; \ @@ -117,6 +119,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/4c7220322bc74b0fc8416e1958cadd7bc51fe1b7.diff?full_index=1' -o 18743.patch; \ + echo 'a19e795b24c52d4d1aa3d45b67339e1b62a5365b37cf4418b83e2709fc98bcb5 *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/Dockerfile-linux.template b/Dockerfile-linux.template index 4d423b8c12..8441c7ab62 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -12,6 +12,26 @@ ; def is_alpine: env.from | startswith("alpine") + ; + def rcVersion: + env.version | rtrimstr("-rc") + ; + def need_patch_11678: + # https://github.com/docker-library/php/pull/1552 + # https://github.com/php/php-src/issues/11678 "Build fails on musl 1.2.4 - lfs64" stream_cookie_seeker + # https://github.com/php/php-src/issues/14834 "Error installing PHP when --with-pear is used" xml errors + is_alpine and rcVersion == "8.1" + ; + def need_patch_18743: + # https://github.com/docker-library/php/pull/1580 + # https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c" + env.variant == "zts" # only needed for ZTS builds + and is_alpine + and (env.from != "alpine:3.21") # only needed for Alpine 3.22+ + and ( + IN(rcVersion; "8.1", "8.2") + or IN(.version; "8.3.22", "8.4.8") # https://github.com/docker-library/php/pull/1580#issuecomment-2955259172 + ) -}} FROM {{ env.from }} @@ -190,7 +210,7 @@ ENV GPG_KEYS {{ "39B6 4134 3D8C 104B 2B14 6DC3 F9C3 9DC0 B969 8544", # ramsey "F1F6 9223 8FBC 1666 E5A5 CCD4 199F 9DFE F6FF BAFD" # patrickallaert ], - }[env.version | rtrimstr("-rc")] // error("missing GPG keys for " + env.version) + }[rcVersion] // error("missing GPG keys for " + rcVersion) | map(gsub(" "; "")) | join(" ") }} @@ -261,8 +281,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, + # https://github.com/docker-library/php/pull/1552 (11678) & https://github.com/docker-library/php/pull/1580 (14834) + if need_patch_11678 or need_patch_18743 then "patch", "patchutils" else empty end, "readline-dev", "sqlite-dev", # https://github.com/docker-library/php/issues/888 @@ -306,7 +326,7 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ -{{ if is_alpine and (env.version | rtrimstr("-rc") == "8.1") then ( -}} +{{ if need_patch_11678 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; \ @@ -318,6 +338,23 @@ RUN set -eux; \ echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \ filterdiff -x '*/NEWS' 14834.patch | patch -p1; \ rm 14834.patch; \ +{{ ) else "" end -}} +{{ + if need_patch_18743 then + # https://github.com/docker-library/php/pull/1580#issuecomment-2957191901 + { + "8.1": { url: "https://github.com/php/php-src/commit/6b105d4bc57e20a2472c9a6ff11fba32768556d4.patch?full_index=1", sha256: "037e1610ae5d444e9a8c3ecd9d5f0cd215fd0aac90bdd7b9f0b259bffdf3566b" }, + "8.4": { url: "https://github.com/php/php-src/commit/4c7220322bc74b0fc8416e1958cadd7bc51fe1b7.diff?full_index=1", sha256: "a19e795b24c52d4d1aa3d45b67339e1b62a5365b37cf4418b83e2709fc98bcb5" }, + }[rcVersion] + // { url: "https://github.com/php/php-src/commit/b3c8afe272a6919248986c703c2e1defc73ff707.patch?full_index=1", sha256: "b334f73434c9732a4b27a42eb5d417e10df842e854c02a3e753b2479f8978bf5" } + | ( +-}} + # 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 {{ .url | @sh }} -o 18743.patch; \ + echo {{ "\(.sha256) *18743.patch" | @sh }} | sha256sum -c -; \ + filterdiff -x '*/NEWS' 18743.patch | patch -p1; \ + rm 18743.patch; \ {{ ) else "" end -}} gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ {{ if is_alpine then "" else ( -}} @@ -341,7 +378,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -{{ if env.version | rtrimstr("-rc") == "8.1" then ( -}} +{{ if rcVersion == "8.1" then ( -}} # --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ {{ ) else "" end -}} @@ -375,7 +412,7 @@ RUN set -eux; \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") --with-pear \ \ -{{ if env.version | rtrimstr("-rc") | IN("8.1", "8.2") then ( -}} +{{ if rcVersion | IN("8.1", "8.2") then ( -}} # bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) # https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c # https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib @@ -412,7 +449,7 @@ RUN set -eux; \ --enable-zts \ # https://externals.io/message/118859 --disable-zend-signals \ -{{ if env.version | rtrimstr("-rc") | IN("8.1", "8.2") then ( -}} +{{ if rcVersion | IN("8.1", "8.2") then ( -}} --enable-zend-max-execution-timers \ {{ ) else "" end -}} {{ ) else "" end -}}