diff --git a/8.1/alpine3.18/cli/Dockerfile b/8.1/alpine3.20/cli/Dockerfile similarity index 99% rename from 8.1/alpine3.18/cli/Dockerfile rename to 8.1/alpine3.20/cli/Dockerfile index 913278e580..fab550c57a 100644 --- a/8.1/alpine3.18/cli/Dockerfile +++ b/8.1/alpine3.20/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/cli/docker-php-entrypoint b/8.1/alpine3.20/cli/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.18/cli/docker-php-entrypoint rename to 8.1/alpine3.20/cli/docker-php-entrypoint diff --git a/8.1/alpine3.18/cli/docker-php-ext-configure b/8.1/alpine3.20/cli/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.18/cli/docker-php-ext-configure rename to 8.1/alpine3.20/cli/docker-php-ext-configure diff --git a/8.1/alpine3.18/cli/docker-php-ext-enable b/8.1/alpine3.20/cli/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.18/cli/docker-php-ext-enable rename to 8.1/alpine3.20/cli/docker-php-ext-enable diff --git a/8.1/alpine3.18/cli/docker-php-ext-install b/8.1/alpine3.20/cli/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.18/cli/docker-php-ext-install rename to 8.1/alpine3.20/cli/docker-php-ext-install diff --git a/8.1/alpine3.18/cli/docker-php-source b/8.1/alpine3.20/cli/docker-php-source similarity index 100% rename from 8.1/alpine3.18/cli/docker-php-source rename to 8.1/alpine3.20/cli/docker-php-source diff --git a/8.1/alpine3.18/fpm/Dockerfile b/8.1/alpine3.20/fpm/Dockerfile similarity index 99% rename from 8.1/alpine3.18/fpm/Dockerfile rename to 8.1/alpine3.20/fpm/Dockerfile index ab4fb91987..dbfc63b28a 100644 --- a/8.1/alpine3.18/fpm/Dockerfile +++ b/8.1/alpine3.20/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/fpm/docker-php-entrypoint b/8.1/alpine3.20/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.18/fpm/docker-php-entrypoint rename to 8.1/alpine3.20/fpm/docker-php-entrypoint diff --git a/8.1/alpine3.18/fpm/docker-php-ext-configure b/8.1/alpine3.20/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.18/fpm/docker-php-ext-configure rename to 8.1/alpine3.20/fpm/docker-php-ext-configure diff --git a/8.1/alpine3.18/fpm/docker-php-ext-enable b/8.1/alpine3.20/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.18/fpm/docker-php-ext-enable rename to 8.1/alpine3.20/fpm/docker-php-ext-enable diff --git a/8.1/alpine3.18/fpm/docker-php-ext-install b/8.1/alpine3.20/fpm/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.18/fpm/docker-php-ext-install rename to 8.1/alpine3.20/fpm/docker-php-ext-install diff --git a/8.1/alpine3.18/fpm/docker-php-source b/8.1/alpine3.20/fpm/docker-php-source similarity index 100% rename from 8.1/alpine3.18/fpm/docker-php-source rename to 8.1/alpine3.20/fpm/docker-php-source diff --git a/8.1/alpine3.18/zts/Dockerfile b/8.1/alpine3.20/zts/Dockerfile similarity index 99% rename from 8.1/alpine3.18/zts/Dockerfile rename to 8.1/alpine3.20/zts/Dockerfile index 0567a10417..bfd95ba6ee 100644 --- a/8.1/alpine3.18/zts/Dockerfile +++ b/8.1/alpine3.20/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/zts/docker-php-entrypoint b/8.1/alpine3.20/zts/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.18/zts/docker-php-entrypoint rename to 8.1/alpine3.20/zts/docker-php-entrypoint diff --git a/8.1/alpine3.18/zts/docker-php-ext-configure b/8.1/alpine3.20/zts/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.18/zts/docker-php-ext-configure rename to 8.1/alpine3.20/zts/docker-php-ext-configure diff --git a/8.1/alpine3.18/zts/docker-php-ext-enable b/8.1/alpine3.20/zts/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.18/zts/docker-php-ext-enable rename to 8.1/alpine3.20/zts/docker-php-ext-enable diff --git a/8.1/alpine3.18/zts/docker-php-ext-install b/8.1/alpine3.20/zts/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.18/zts/docker-php-ext-install rename to 8.1/alpine3.20/zts/docker-php-ext-install diff --git a/8.1/alpine3.18/zts/docker-php-source b/8.1/alpine3.20/zts/docker-php-source similarity index 100% rename from 8.1/alpine3.18/zts/docker-php-source rename to 8.1/alpine3.20/zts/docker-php-source diff --git a/8.2/alpine3.18/cli/Dockerfile b/8.2/alpine3.20/cli/Dockerfile similarity index 99% rename from 8.2/alpine3.18/cli/Dockerfile rename to 8.2/alpine3.20/cli/Dockerfile index 20543829b6..6b2fedceb7 100644 --- a/8.2/alpine3.18/cli/Dockerfile +++ b/8.2/alpine3.20/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/cli/docker-php-entrypoint b/8.2/alpine3.20/cli/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.18/cli/docker-php-entrypoint rename to 8.2/alpine3.20/cli/docker-php-entrypoint diff --git a/8.2/alpine3.18/cli/docker-php-ext-configure b/8.2/alpine3.20/cli/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.18/cli/docker-php-ext-configure rename to 8.2/alpine3.20/cli/docker-php-ext-configure diff --git a/8.2/alpine3.18/cli/docker-php-ext-enable b/8.2/alpine3.20/cli/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.18/cli/docker-php-ext-enable rename to 8.2/alpine3.20/cli/docker-php-ext-enable diff --git a/8.2/alpine3.18/cli/docker-php-ext-install b/8.2/alpine3.20/cli/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.18/cli/docker-php-ext-install rename to 8.2/alpine3.20/cli/docker-php-ext-install diff --git a/8.2/alpine3.18/cli/docker-php-source b/8.2/alpine3.20/cli/docker-php-source similarity index 100% rename from 8.2/alpine3.18/cli/docker-php-source rename to 8.2/alpine3.20/cli/docker-php-source diff --git a/8.2/alpine3.18/fpm/Dockerfile b/8.2/alpine3.20/fpm/Dockerfile similarity index 99% rename from 8.2/alpine3.18/fpm/Dockerfile rename to 8.2/alpine3.20/fpm/Dockerfile index 75dfec09c6..cbb29815ba 100644 --- a/8.2/alpine3.18/fpm/Dockerfile +++ b/8.2/alpine3.20/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/fpm/docker-php-entrypoint b/8.2/alpine3.20/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.18/fpm/docker-php-entrypoint rename to 8.2/alpine3.20/fpm/docker-php-entrypoint diff --git a/8.2/alpine3.18/fpm/docker-php-ext-configure b/8.2/alpine3.20/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.18/fpm/docker-php-ext-configure rename to 8.2/alpine3.20/fpm/docker-php-ext-configure diff --git a/8.2/alpine3.18/fpm/docker-php-ext-enable b/8.2/alpine3.20/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.18/fpm/docker-php-ext-enable rename to 8.2/alpine3.20/fpm/docker-php-ext-enable diff --git a/8.2/alpine3.18/fpm/docker-php-ext-install b/8.2/alpine3.20/fpm/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.18/fpm/docker-php-ext-install rename to 8.2/alpine3.20/fpm/docker-php-ext-install diff --git a/8.2/alpine3.18/fpm/docker-php-source b/8.2/alpine3.20/fpm/docker-php-source similarity index 100% rename from 8.2/alpine3.18/fpm/docker-php-source rename to 8.2/alpine3.20/fpm/docker-php-source diff --git a/8.2/alpine3.18/zts/Dockerfile b/8.2/alpine3.20/zts/Dockerfile similarity index 99% rename from 8.2/alpine3.18/zts/Dockerfile rename to 8.2/alpine3.20/zts/Dockerfile index ebd5c9e036..dd9ba32a54 100644 --- a/8.2/alpine3.18/zts/Dockerfile +++ b/8.2/alpine3.20/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/zts/docker-php-entrypoint b/8.2/alpine3.20/zts/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.18/zts/docker-php-entrypoint rename to 8.2/alpine3.20/zts/docker-php-entrypoint diff --git a/8.2/alpine3.18/zts/docker-php-ext-configure b/8.2/alpine3.20/zts/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.18/zts/docker-php-ext-configure rename to 8.2/alpine3.20/zts/docker-php-ext-configure diff --git a/8.2/alpine3.18/zts/docker-php-ext-enable b/8.2/alpine3.20/zts/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.18/zts/docker-php-ext-enable rename to 8.2/alpine3.20/zts/docker-php-ext-enable diff --git a/8.2/alpine3.18/zts/docker-php-ext-install b/8.2/alpine3.20/zts/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.18/zts/docker-php-ext-install rename to 8.2/alpine3.20/zts/docker-php-ext-install diff --git a/8.2/alpine3.18/zts/docker-php-source b/8.2/alpine3.20/zts/docker-php-source similarity index 100% rename from 8.2/alpine3.18/zts/docker-php-source rename to 8.2/alpine3.20/zts/docker-php-source diff --git a/8.3/alpine3.18/cli/Dockerfile b/8.3/alpine3.20/cli/Dockerfile similarity index 99% rename from 8.3/alpine3.18/cli/Dockerfile rename to 8.3/alpine3.20/cli/Dockerfile index 879be70047..e1283f90b8 100644 --- a/8.3/alpine3.18/cli/Dockerfile +++ b/8.3/alpine3.20/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/cli/docker-php-entrypoint b/8.3/alpine3.20/cli/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.18/cli/docker-php-entrypoint rename to 8.3/alpine3.20/cli/docker-php-entrypoint diff --git a/8.3/alpine3.18/cli/docker-php-ext-configure b/8.3/alpine3.20/cli/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.18/cli/docker-php-ext-configure rename to 8.3/alpine3.20/cli/docker-php-ext-configure diff --git a/8.3/alpine3.18/cli/docker-php-ext-enable b/8.3/alpine3.20/cli/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.18/cli/docker-php-ext-enable rename to 8.3/alpine3.20/cli/docker-php-ext-enable diff --git a/8.3/alpine3.18/cli/docker-php-ext-install b/8.3/alpine3.20/cli/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.18/cli/docker-php-ext-install rename to 8.3/alpine3.20/cli/docker-php-ext-install diff --git a/8.3/alpine3.18/cli/docker-php-source b/8.3/alpine3.20/cli/docker-php-source similarity index 100% rename from 8.3/alpine3.18/cli/docker-php-source rename to 8.3/alpine3.20/cli/docker-php-source diff --git a/8.3/alpine3.18/fpm/Dockerfile b/8.3/alpine3.20/fpm/Dockerfile similarity index 99% rename from 8.3/alpine3.18/fpm/Dockerfile rename to 8.3/alpine3.20/fpm/Dockerfile index e1e6c20c82..12be80f2ad 100644 --- a/8.3/alpine3.18/fpm/Dockerfile +++ b/8.3/alpine3.20/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/fpm/docker-php-entrypoint b/8.3/alpine3.20/fpm/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.18/fpm/docker-php-entrypoint rename to 8.3/alpine3.20/fpm/docker-php-entrypoint diff --git a/8.3/alpine3.18/fpm/docker-php-ext-configure b/8.3/alpine3.20/fpm/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.18/fpm/docker-php-ext-configure rename to 8.3/alpine3.20/fpm/docker-php-ext-configure diff --git a/8.3/alpine3.18/fpm/docker-php-ext-enable b/8.3/alpine3.20/fpm/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.18/fpm/docker-php-ext-enable rename to 8.3/alpine3.20/fpm/docker-php-ext-enable diff --git a/8.3/alpine3.18/fpm/docker-php-ext-install b/8.3/alpine3.20/fpm/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.18/fpm/docker-php-ext-install rename to 8.3/alpine3.20/fpm/docker-php-ext-install diff --git a/8.3/alpine3.18/fpm/docker-php-source b/8.3/alpine3.20/fpm/docker-php-source similarity index 100% rename from 8.3/alpine3.18/fpm/docker-php-source rename to 8.3/alpine3.20/fpm/docker-php-source diff --git a/8.3/alpine3.18/zts/Dockerfile b/8.3/alpine3.20/zts/Dockerfile similarity index 99% rename from 8.3/alpine3.18/zts/Dockerfile rename to 8.3/alpine3.20/zts/Dockerfile index 232491b265..4c918f77fb 100644 --- a/8.3/alpine3.18/zts/Dockerfile +++ b/8.3/alpine3.20/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 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.18/zts/docker-php-entrypoint b/8.3/alpine3.20/zts/docker-php-entrypoint similarity index 100% rename from 8.3/alpine3.18/zts/docker-php-entrypoint rename to 8.3/alpine3.20/zts/docker-php-entrypoint diff --git a/8.3/alpine3.18/zts/docker-php-ext-configure b/8.3/alpine3.20/zts/docker-php-ext-configure similarity index 100% rename from 8.3/alpine3.18/zts/docker-php-ext-configure rename to 8.3/alpine3.20/zts/docker-php-ext-configure diff --git a/8.3/alpine3.18/zts/docker-php-ext-enable b/8.3/alpine3.20/zts/docker-php-ext-enable similarity index 100% rename from 8.3/alpine3.18/zts/docker-php-ext-enable rename to 8.3/alpine3.20/zts/docker-php-ext-enable diff --git a/8.3/alpine3.18/zts/docker-php-ext-install b/8.3/alpine3.20/zts/docker-php-ext-install similarity index 100% rename from 8.3/alpine3.18/zts/docker-php-ext-install rename to 8.3/alpine3.20/zts/docker-php-ext-install diff --git a/8.3/alpine3.18/zts/docker-php-source b/8.3/alpine3.20/zts/docker-php-source similarity index 100% rename from 8.3/alpine3.18/zts/docker-php-source rename to 8.3/alpine3.20/zts/docker-php-source diff --git a/versions.json b/versions.json index 1a8641f12c..c0c7263469 100644 --- a/versions.json +++ b/versions.json @@ -12,12 +12,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.20/cli", + "alpine3.20/fpm", + "alpine3.20/zts", "alpine3.19/cli", "alpine3.19/fpm", - "alpine3.19/zts", - "alpine3.18/cli", - "alpine3.18/fpm", - "alpine3.18/zts" + "alpine3.19/zts" ], "version": "8.1.28" }, @@ -35,12 +35,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.20/cli", + "alpine3.20/fpm", + "alpine3.20/zts", "alpine3.19/cli", "alpine3.19/fpm", - "alpine3.19/zts", - "alpine3.18/cli", - "alpine3.18/fpm", - "alpine3.18/zts" + "alpine3.19/zts" ], "version": "8.2.19" }, @@ -58,12 +58,12 @@ "bullseye/apache", "bullseye/fpm", "bullseye/zts", + "alpine3.20/cli", + "alpine3.20/fpm", + "alpine3.20/zts", "alpine3.19/cli", "alpine3.19/fpm", - "alpine3.19/zts", - "alpine3.18/cli", - "alpine3.18/fpm", - "alpine3.18/zts" + "alpine3.19/zts" ], "version": "8.3.7" }, diff --git a/versions.sh b/versions.sh index 3cef7999d2..ef0703d457 100755 --- a/versions.sh +++ b/versions.sh @@ -87,8 +87,8 @@ for version in "${versions[@]}"; do for suite in \ bookworm \ bullseye \ + alpine3.20 \ alpine3.19 \ - alpine3.18 \ ; do for variant in cli apache fpm zts; do if [[ "$suite" = alpine* ]]; then