From 9a3c8d8a80ca26cf64328b6da1f34f6a9b123550 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 10 May 2023 11:41:15 +0200 Subject: [PATCH] Add Alpine 3.18 variant for PHP >= 8.1 Keep Alpine 3.16 to support PHP 8.0 --- .../{alpine3.16 => alpine3.18}/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 .../{alpine3.16 => alpine3.18}/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 .../{alpine3.16 => alpine3.18}/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.1/{alpine3.16 => alpine3.18}/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.16 => alpine3.18}/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.16 => alpine3.18}/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 .../{alpine3.16 => alpine3.18}/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 .../{alpine3.16 => alpine3.18}/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 .../{alpine3.16 => alpine3.18}/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.16 => alpine3.18}/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.16 => alpine3.18}/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.16 => alpine3.18}/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 | 5 +++ 74 files changed, 33 insertions(+), 28 deletions(-) rename 8.1-rc/{alpine3.16 => alpine3.18}/cli/Dockerfile (99%) rename 8.1-rc/{alpine3.16 => alpine3.18}/cli/docker-php-entrypoint (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/cli/docker-php-ext-configure (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/cli/docker-php-ext-enable (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/cli/docker-php-ext-install (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/cli/docker-php-source (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/fpm/Dockerfile (99%) rename 8.1-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-entrypoint (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-configure (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-enable (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-install (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-source (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/zts/Dockerfile (99%) rename 8.1-rc/{alpine3.16 => alpine3.18}/zts/docker-php-entrypoint (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/zts/docker-php-ext-configure (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/zts/docker-php-ext-enable (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/zts/docker-php-ext-install (100%) rename 8.1-rc/{alpine3.16 => alpine3.18}/zts/docker-php-source (100%) rename 8.1/{alpine3.16 => alpine3.18}/cli/Dockerfile (99%) rename 8.1/{alpine3.16 => alpine3.18}/cli/docker-php-entrypoint (100%) rename 8.1/{alpine3.16 => alpine3.18}/cli/docker-php-ext-configure (100%) rename 8.1/{alpine3.16 => alpine3.18}/cli/docker-php-ext-enable (100%) rename 8.1/{alpine3.16 => alpine3.18}/cli/docker-php-ext-install (100%) rename 8.1/{alpine3.16 => alpine3.18}/cli/docker-php-source (100%) rename 8.1/{alpine3.16 => alpine3.18}/fpm/Dockerfile (99%) rename 8.1/{alpine3.16 => alpine3.18}/fpm/docker-php-entrypoint (100%) rename 8.1/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-configure (100%) rename 8.1/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-enable (100%) rename 8.1/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-install (100%) rename 8.1/{alpine3.16 => alpine3.18}/fpm/docker-php-source (100%) rename 8.1/{alpine3.16 => alpine3.18}/zts/Dockerfile (99%) rename 8.1/{alpine3.16 => alpine3.18}/zts/docker-php-entrypoint (100%) rename 8.1/{alpine3.16 => alpine3.18}/zts/docker-php-ext-configure (100%) rename 8.1/{alpine3.16 => alpine3.18}/zts/docker-php-ext-enable (100%) rename 8.1/{alpine3.16 => alpine3.18}/zts/docker-php-ext-install (100%) rename 8.1/{alpine3.16 => alpine3.18}/zts/docker-php-source (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/cli/Dockerfile (99%) rename 8.2-rc/{alpine3.16 => alpine3.18}/cli/docker-php-entrypoint (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/cli/docker-php-ext-configure (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/cli/docker-php-ext-enable (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/cli/docker-php-ext-install (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/cli/docker-php-source (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/fpm/Dockerfile (99%) rename 8.2-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-entrypoint (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-configure (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-enable (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-install (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/fpm/docker-php-source (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/zts/Dockerfile (99%) rename 8.2-rc/{alpine3.16 => alpine3.18}/zts/docker-php-entrypoint (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/zts/docker-php-ext-configure (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/zts/docker-php-ext-enable (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/zts/docker-php-ext-install (100%) rename 8.2-rc/{alpine3.16 => alpine3.18}/zts/docker-php-source (100%) rename 8.2/{alpine3.16 => alpine3.18}/cli/Dockerfile (99%) rename 8.2/{alpine3.16 => alpine3.18}/cli/docker-php-entrypoint (100%) rename 8.2/{alpine3.16 => alpine3.18}/cli/docker-php-ext-configure (100%) rename 8.2/{alpine3.16 => alpine3.18}/cli/docker-php-ext-enable (100%) rename 8.2/{alpine3.16 => alpine3.18}/cli/docker-php-ext-install (100%) rename 8.2/{alpine3.16 => alpine3.18}/cli/docker-php-source (100%) rename 8.2/{alpine3.16 => alpine3.18}/fpm/Dockerfile (99%) rename 8.2/{alpine3.16 => alpine3.18}/fpm/docker-php-entrypoint (100%) rename 8.2/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-configure (100%) rename 8.2/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-enable (100%) rename 8.2/{alpine3.16 => alpine3.18}/fpm/docker-php-ext-install (100%) rename 8.2/{alpine3.16 => alpine3.18}/fpm/docker-php-source (100%) rename 8.2/{alpine3.16 => alpine3.18}/zts/Dockerfile (99%) rename 8.2/{alpine3.16 => alpine3.18}/zts/docker-php-entrypoint (100%) rename 8.2/{alpine3.16 => alpine3.18}/zts/docker-php-ext-configure (100%) rename 8.2/{alpine3.16 => alpine3.18}/zts/docker-php-ext-enable (100%) rename 8.2/{alpine3.16 => alpine3.18}/zts/docker-php-ext-install (100%) rename 8.2/{alpine3.16 => alpine3.18}/zts/docker-php-source (100%) diff --git a/8.1-rc/alpine3.16/cli/Dockerfile b/8.1-rc/alpine3.18/cli/Dockerfile similarity index 99% rename from 8.1-rc/alpine3.16/cli/Dockerfile rename to 8.1-rc/alpine3.18/cli/Dockerfile index 6ad5da91..552e7066 100644 --- a/8.1-rc/alpine3.16/cli/Dockerfile +++ b/8.1-rc/alpine3.18/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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-rc/alpine3.16/cli/docker-php-entrypoint b/8.1-rc/alpine3.18/cli/docker-php-entrypoint similarity index 100% rename from 8.1-rc/alpine3.16/cli/docker-php-entrypoint rename to 8.1-rc/alpine3.18/cli/docker-php-entrypoint diff --git a/8.1-rc/alpine3.16/cli/docker-php-ext-configure b/8.1-rc/alpine3.18/cli/docker-php-ext-configure similarity index 100% rename from 8.1-rc/alpine3.16/cli/docker-php-ext-configure rename to 8.1-rc/alpine3.18/cli/docker-php-ext-configure diff --git a/8.1-rc/alpine3.16/cli/docker-php-ext-enable b/8.1-rc/alpine3.18/cli/docker-php-ext-enable similarity index 100% rename from 8.1-rc/alpine3.16/cli/docker-php-ext-enable rename to 8.1-rc/alpine3.18/cli/docker-php-ext-enable diff --git a/8.1-rc/alpine3.16/cli/docker-php-ext-install b/8.1-rc/alpine3.18/cli/docker-php-ext-install similarity index 100% rename from 8.1-rc/alpine3.16/cli/docker-php-ext-install rename to 8.1-rc/alpine3.18/cli/docker-php-ext-install diff --git a/8.1-rc/alpine3.16/cli/docker-php-source b/8.1-rc/alpine3.18/cli/docker-php-source similarity index 100% rename from 8.1-rc/alpine3.16/cli/docker-php-source rename to 8.1-rc/alpine3.18/cli/docker-php-source diff --git a/8.1-rc/alpine3.16/fpm/Dockerfile b/8.1-rc/alpine3.18/fpm/Dockerfile similarity index 99% rename from 8.1-rc/alpine3.16/fpm/Dockerfile rename to 8.1-rc/alpine3.18/fpm/Dockerfile index 7ca48fc0..44bb180b 100644 --- a/8.1-rc/alpine3.16/fpm/Dockerfile +++ b/8.1-rc/alpine3.18/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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-rc/alpine3.16/fpm/docker-php-entrypoint b/8.1-rc/alpine3.18/fpm/docker-php-entrypoint similarity index 100% rename from 8.1-rc/alpine3.16/fpm/docker-php-entrypoint rename to 8.1-rc/alpine3.18/fpm/docker-php-entrypoint diff --git a/8.1-rc/alpine3.16/fpm/docker-php-ext-configure b/8.1-rc/alpine3.18/fpm/docker-php-ext-configure similarity index 100% rename from 8.1-rc/alpine3.16/fpm/docker-php-ext-configure rename to 8.1-rc/alpine3.18/fpm/docker-php-ext-configure diff --git a/8.1-rc/alpine3.16/fpm/docker-php-ext-enable b/8.1-rc/alpine3.18/fpm/docker-php-ext-enable similarity index 100% rename from 8.1-rc/alpine3.16/fpm/docker-php-ext-enable rename to 8.1-rc/alpine3.18/fpm/docker-php-ext-enable diff --git a/8.1-rc/alpine3.16/fpm/docker-php-ext-install b/8.1-rc/alpine3.18/fpm/docker-php-ext-install similarity index 100% rename from 8.1-rc/alpine3.16/fpm/docker-php-ext-install rename to 8.1-rc/alpine3.18/fpm/docker-php-ext-install diff --git a/8.1-rc/alpine3.16/fpm/docker-php-source b/8.1-rc/alpine3.18/fpm/docker-php-source similarity index 100% rename from 8.1-rc/alpine3.16/fpm/docker-php-source rename to 8.1-rc/alpine3.18/fpm/docker-php-source diff --git a/8.1-rc/alpine3.16/zts/Dockerfile b/8.1-rc/alpine3.18/zts/Dockerfile similarity index 99% rename from 8.1-rc/alpine3.16/zts/Dockerfile rename to 8.1-rc/alpine3.18/zts/Dockerfile index 12375f06..e05fc187 100644 --- a/8.1-rc/alpine3.16/zts/Dockerfile +++ b/8.1-rc/alpine3.18/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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-rc/alpine3.16/zts/docker-php-entrypoint b/8.1-rc/alpine3.18/zts/docker-php-entrypoint similarity index 100% rename from 8.1-rc/alpine3.16/zts/docker-php-entrypoint rename to 8.1-rc/alpine3.18/zts/docker-php-entrypoint diff --git a/8.1-rc/alpine3.16/zts/docker-php-ext-configure b/8.1-rc/alpine3.18/zts/docker-php-ext-configure similarity index 100% rename from 8.1-rc/alpine3.16/zts/docker-php-ext-configure rename to 8.1-rc/alpine3.18/zts/docker-php-ext-configure diff --git a/8.1-rc/alpine3.16/zts/docker-php-ext-enable b/8.1-rc/alpine3.18/zts/docker-php-ext-enable similarity index 100% rename from 8.1-rc/alpine3.16/zts/docker-php-ext-enable rename to 8.1-rc/alpine3.18/zts/docker-php-ext-enable diff --git a/8.1-rc/alpine3.16/zts/docker-php-ext-install b/8.1-rc/alpine3.18/zts/docker-php-ext-install similarity index 100% rename from 8.1-rc/alpine3.16/zts/docker-php-ext-install rename to 8.1-rc/alpine3.18/zts/docker-php-ext-install diff --git a/8.1-rc/alpine3.16/zts/docker-php-source b/8.1-rc/alpine3.18/zts/docker-php-source similarity index 100% rename from 8.1-rc/alpine3.16/zts/docker-php-source rename to 8.1-rc/alpine3.18/zts/docker-php-source diff --git a/8.1/alpine3.16/cli/Dockerfile b/8.1/alpine3.18/cli/Dockerfile similarity index 99% rename from 8.1/alpine3.16/cli/Dockerfile rename to 8.1/alpine3.18/cli/Dockerfile index d2173de5..96c196c2 100644 --- a/8.1/alpine3.16/cli/Dockerfile +++ b/8.1/alpine3.18/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/cli/docker-php-entrypoint b/8.1/alpine3.18/cli/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.16/cli/docker-php-entrypoint rename to 8.1/alpine3.18/cli/docker-php-entrypoint diff --git a/8.1/alpine3.16/cli/docker-php-ext-configure b/8.1/alpine3.18/cli/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.16/cli/docker-php-ext-configure rename to 8.1/alpine3.18/cli/docker-php-ext-configure diff --git a/8.1/alpine3.16/cli/docker-php-ext-enable b/8.1/alpine3.18/cli/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.16/cli/docker-php-ext-enable rename to 8.1/alpine3.18/cli/docker-php-ext-enable diff --git a/8.1/alpine3.16/cli/docker-php-ext-install b/8.1/alpine3.18/cli/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.16/cli/docker-php-ext-install rename to 8.1/alpine3.18/cli/docker-php-ext-install diff --git a/8.1/alpine3.16/cli/docker-php-source b/8.1/alpine3.18/cli/docker-php-source similarity index 100% rename from 8.1/alpine3.16/cli/docker-php-source rename to 8.1/alpine3.18/cli/docker-php-source diff --git a/8.1/alpine3.16/fpm/Dockerfile b/8.1/alpine3.18/fpm/Dockerfile similarity index 99% rename from 8.1/alpine3.16/fpm/Dockerfile rename to 8.1/alpine3.18/fpm/Dockerfile index 864a76c4..d253b1b2 100644 --- a/8.1/alpine3.16/fpm/Dockerfile +++ b/8.1/alpine3.18/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/fpm/docker-php-entrypoint b/8.1/alpine3.18/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.16/fpm/docker-php-entrypoint rename to 8.1/alpine3.18/fpm/docker-php-entrypoint diff --git a/8.1/alpine3.16/fpm/docker-php-ext-configure b/8.1/alpine3.18/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.16/fpm/docker-php-ext-configure rename to 8.1/alpine3.18/fpm/docker-php-ext-configure diff --git a/8.1/alpine3.16/fpm/docker-php-ext-enable b/8.1/alpine3.18/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.16/fpm/docker-php-ext-enable rename to 8.1/alpine3.18/fpm/docker-php-ext-enable diff --git a/8.1/alpine3.16/fpm/docker-php-ext-install b/8.1/alpine3.18/fpm/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.16/fpm/docker-php-ext-install rename to 8.1/alpine3.18/fpm/docker-php-ext-install diff --git a/8.1/alpine3.16/fpm/docker-php-source b/8.1/alpine3.18/fpm/docker-php-source similarity index 100% rename from 8.1/alpine3.16/fpm/docker-php-source rename to 8.1/alpine3.18/fpm/docker-php-source diff --git a/8.1/alpine3.16/zts/Dockerfile b/8.1/alpine3.18/zts/Dockerfile similarity index 99% rename from 8.1/alpine3.16/zts/Dockerfile rename to 8.1/alpine3.18/zts/Dockerfile index b04a4f19..8d4cc1a4 100644 --- a/8.1/alpine3.16/zts/Dockerfile +++ b/8.1/alpine3.18/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/zts/docker-php-entrypoint b/8.1/alpine3.18/zts/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.16/zts/docker-php-entrypoint rename to 8.1/alpine3.18/zts/docker-php-entrypoint diff --git a/8.1/alpine3.16/zts/docker-php-ext-configure b/8.1/alpine3.18/zts/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.16/zts/docker-php-ext-configure rename to 8.1/alpine3.18/zts/docker-php-ext-configure diff --git a/8.1/alpine3.16/zts/docker-php-ext-enable b/8.1/alpine3.18/zts/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.16/zts/docker-php-ext-enable rename to 8.1/alpine3.18/zts/docker-php-ext-enable diff --git a/8.1/alpine3.16/zts/docker-php-ext-install b/8.1/alpine3.18/zts/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.16/zts/docker-php-ext-install rename to 8.1/alpine3.18/zts/docker-php-ext-install diff --git a/8.1/alpine3.16/zts/docker-php-source b/8.1/alpine3.18/zts/docker-php-source similarity index 100% rename from 8.1/alpine3.16/zts/docker-php-source rename to 8.1/alpine3.18/zts/docker-php-source diff --git a/8.2-rc/alpine3.16/cli/Dockerfile b/8.2-rc/alpine3.18/cli/Dockerfile similarity index 99% rename from 8.2-rc/alpine3.16/cli/Dockerfile rename to 8.2-rc/alpine3.18/cli/Dockerfile index d127c7cb..51313c76 100644 --- a/8.2-rc/alpine3.16/cli/Dockerfile +++ b/8.2-rc/alpine3.18/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/cli/docker-php-entrypoint b/8.2-rc/alpine3.18/cli/docker-php-entrypoint similarity index 100% rename from 8.2-rc/alpine3.16/cli/docker-php-entrypoint rename to 8.2-rc/alpine3.18/cli/docker-php-entrypoint diff --git a/8.2-rc/alpine3.16/cli/docker-php-ext-configure b/8.2-rc/alpine3.18/cli/docker-php-ext-configure similarity index 100% rename from 8.2-rc/alpine3.16/cli/docker-php-ext-configure rename to 8.2-rc/alpine3.18/cli/docker-php-ext-configure diff --git a/8.2-rc/alpine3.16/cli/docker-php-ext-enable b/8.2-rc/alpine3.18/cli/docker-php-ext-enable similarity index 100% rename from 8.2-rc/alpine3.16/cli/docker-php-ext-enable rename to 8.2-rc/alpine3.18/cli/docker-php-ext-enable diff --git a/8.2-rc/alpine3.16/cli/docker-php-ext-install b/8.2-rc/alpine3.18/cli/docker-php-ext-install similarity index 100% rename from 8.2-rc/alpine3.16/cli/docker-php-ext-install rename to 8.2-rc/alpine3.18/cli/docker-php-ext-install diff --git a/8.2-rc/alpine3.16/cli/docker-php-source b/8.2-rc/alpine3.18/cli/docker-php-source similarity index 100% rename from 8.2-rc/alpine3.16/cli/docker-php-source rename to 8.2-rc/alpine3.18/cli/docker-php-source diff --git a/8.2-rc/alpine3.16/fpm/Dockerfile b/8.2-rc/alpine3.18/fpm/Dockerfile similarity index 99% rename from 8.2-rc/alpine3.16/fpm/Dockerfile rename to 8.2-rc/alpine3.18/fpm/Dockerfile index e5b6254c..f1bbe8e6 100644 --- a/8.2-rc/alpine3.16/fpm/Dockerfile +++ b/8.2-rc/alpine3.18/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/fpm/docker-php-entrypoint b/8.2-rc/alpine3.18/fpm/docker-php-entrypoint similarity index 100% rename from 8.2-rc/alpine3.16/fpm/docker-php-entrypoint rename to 8.2-rc/alpine3.18/fpm/docker-php-entrypoint diff --git a/8.2-rc/alpine3.16/fpm/docker-php-ext-configure b/8.2-rc/alpine3.18/fpm/docker-php-ext-configure similarity index 100% rename from 8.2-rc/alpine3.16/fpm/docker-php-ext-configure rename to 8.2-rc/alpine3.18/fpm/docker-php-ext-configure diff --git a/8.2-rc/alpine3.16/fpm/docker-php-ext-enable b/8.2-rc/alpine3.18/fpm/docker-php-ext-enable similarity index 100% rename from 8.2-rc/alpine3.16/fpm/docker-php-ext-enable rename to 8.2-rc/alpine3.18/fpm/docker-php-ext-enable diff --git a/8.2-rc/alpine3.16/fpm/docker-php-ext-install b/8.2-rc/alpine3.18/fpm/docker-php-ext-install similarity index 100% rename from 8.2-rc/alpine3.16/fpm/docker-php-ext-install rename to 8.2-rc/alpine3.18/fpm/docker-php-ext-install diff --git a/8.2-rc/alpine3.16/fpm/docker-php-source b/8.2-rc/alpine3.18/fpm/docker-php-source similarity index 100% rename from 8.2-rc/alpine3.16/fpm/docker-php-source rename to 8.2-rc/alpine3.18/fpm/docker-php-source diff --git a/8.2-rc/alpine3.16/zts/Dockerfile b/8.2-rc/alpine3.18/zts/Dockerfile similarity index 99% rename from 8.2-rc/alpine3.16/zts/Dockerfile rename to 8.2-rc/alpine3.18/zts/Dockerfile index b0341d56..da876e64 100644 --- a/8.2-rc/alpine3.16/zts/Dockerfile +++ b/8.2-rc/alpine3.18/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/zts/docker-php-entrypoint b/8.2-rc/alpine3.18/zts/docker-php-entrypoint similarity index 100% rename from 8.2-rc/alpine3.16/zts/docker-php-entrypoint rename to 8.2-rc/alpine3.18/zts/docker-php-entrypoint diff --git a/8.2-rc/alpine3.16/zts/docker-php-ext-configure b/8.2-rc/alpine3.18/zts/docker-php-ext-configure similarity index 100% rename from 8.2-rc/alpine3.16/zts/docker-php-ext-configure rename to 8.2-rc/alpine3.18/zts/docker-php-ext-configure diff --git a/8.2-rc/alpine3.16/zts/docker-php-ext-enable b/8.2-rc/alpine3.18/zts/docker-php-ext-enable similarity index 100% rename from 8.2-rc/alpine3.16/zts/docker-php-ext-enable rename to 8.2-rc/alpine3.18/zts/docker-php-ext-enable diff --git a/8.2-rc/alpine3.16/zts/docker-php-ext-install b/8.2-rc/alpine3.18/zts/docker-php-ext-install similarity index 100% rename from 8.2-rc/alpine3.16/zts/docker-php-ext-install rename to 8.2-rc/alpine3.18/zts/docker-php-ext-install diff --git a/8.2-rc/alpine3.16/zts/docker-php-source b/8.2-rc/alpine3.18/zts/docker-php-source similarity index 100% rename from 8.2-rc/alpine3.16/zts/docker-php-source rename to 8.2-rc/alpine3.18/zts/docker-php-source diff --git a/8.2/alpine3.16/cli/Dockerfile b/8.2/alpine3.18/cli/Dockerfile similarity index 99% rename from 8.2/alpine3.16/cli/Dockerfile rename to 8.2/alpine3.18/cli/Dockerfile index ad10348f..4f732c58 100644 --- a/8.2/alpine3.16/cli/Dockerfile +++ b/8.2/alpine3.18/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/cli/docker-php-entrypoint b/8.2/alpine3.18/cli/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.16/cli/docker-php-entrypoint rename to 8.2/alpine3.18/cli/docker-php-entrypoint diff --git a/8.2/alpine3.16/cli/docker-php-ext-configure b/8.2/alpine3.18/cli/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.16/cli/docker-php-ext-configure rename to 8.2/alpine3.18/cli/docker-php-ext-configure diff --git a/8.2/alpine3.16/cli/docker-php-ext-enable b/8.2/alpine3.18/cli/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.16/cli/docker-php-ext-enable rename to 8.2/alpine3.18/cli/docker-php-ext-enable diff --git a/8.2/alpine3.16/cli/docker-php-ext-install b/8.2/alpine3.18/cli/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.16/cli/docker-php-ext-install rename to 8.2/alpine3.18/cli/docker-php-ext-install diff --git a/8.2/alpine3.16/cli/docker-php-source b/8.2/alpine3.18/cli/docker-php-source similarity index 100% rename from 8.2/alpine3.16/cli/docker-php-source rename to 8.2/alpine3.18/cli/docker-php-source diff --git a/8.2/alpine3.16/fpm/Dockerfile b/8.2/alpine3.18/fpm/Dockerfile similarity index 99% rename from 8.2/alpine3.16/fpm/Dockerfile rename to 8.2/alpine3.18/fpm/Dockerfile index c8c825af..db52ed48 100644 --- a/8.2/alpine3.16/fpm/Dockerfile +++ b/8.2/alpine3.18/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/fpm/docker-php-entrypoint b/8.2/alpine3.18/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.16/fpm/docker-php-entrypoint rename to 8.2/alpine3.18/fpm/docker-php-entrypoint diff --git a/8.2/alpine3.16/fpm/docker-php-ext-configure b/8.2/alpine3.18/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.16/fpm/docker-php-ext-configure rename to 8.2/alpine3.18/fpm/docker-php-ext-configure diff --git a/8.2/alpine3.16/fpm/docker-php-ext-enable b/8.2/alpine3.18/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.16/fpm/docker-php-ext-enable rename to 8.2/alpine3.18/fpm/docker-php-ext-enable diff --git a/8.2/alpine3.16/fpm/docker-php-ext-install b/8.2/alpine3.18/fpm/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.16/fpm/docker-php-ext-install rename to 8.2/alpine3.18/fpm/docker-php-ext-install diff --git a/8.2/alpine3.16/fpm/docker-php-source b/8.2/alpine3.18/fpm/docker-php-source similarity index 100% rename from 8.2/alpine3.16/fpm/docker-php-source rename to 8.2/alpine3.18/fpm/docker-php-source diff --git a/8.2/alpine3.16/zts/Dockerfile b/8.2/alpine3.18/zts/Dockerfile similarity index 99% rename from 8.2/alpine3.16/zts/Dockerfile rename to 8.2/alpine3.18/zts/Dockerfile index 27fbec6d..ac7a9609 100644 --- a/8.2/alpine3.16/zts/Dockerfile +++ b/8.2/alpine3.18/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 # 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.16/zts/docker-php-entrypoint b/8.2/alpine3.18/zts/docker-php-entrypoint similarity index 100% rename from 8.2/alpine3.16/zts/docker-php-entrypoint rename to 8.2/alpine3.18/zts/docker-php-entrypoint diff --git a/8.2/alpine3.16/zts/docker-php-ext-configure b/8.2/alpine3.18/zts/docker-php-ext-configure similarity index 100% rename from 8.2/alpine3.16/zts/docker-php-ext-configure rename to 8.2/alpine3.18/zts/docker-php-ext-configure diff --git a/8.2/alpine3.16/zts/docker-php-ext-enable b/8.2/alpine3.18/zts/docker-php-ext-enable similarity index 100% rename from 8.2/alpine3.16/zts/docker-php-ext-enable rename to 8.2/alpine3.18/zts/docker-php-ext-enable diff --git a/8.2/alpine3.16/zts/docker-php-ext-install b/8.2/alpine3.18/zts/docker-php-ext-install similarity index 100% rename from 8.2/alpine3.16/zts/docker-php-ext-install rename to 8.2/alpine3.18/zts/docker-php-ext-install diff --git a/8.2/alpine3.16/zts/docker-php-source b/8.2/alpine3.18/zts/docker-php-source similarity index 100% rename from 8.2/alpine3.16/zts/docker-php-source rename to 8.2/alpine3.18/zts/docker-php-source diff --git a/versions.json b/versions.json index 4c491bf3..f3e93e6e 100644 --- a/versions.json +++ b/versions.json @@ -32,12 +32,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.18/cli", + "alpine3.18/fpm", + "alpine3.18/zts", "alpine3.17/cli", "alpine3.17/fpm", - "alpine3.17/zts", - "alpine3.16/cli", - "alpine3.16/fpm", - "alpine3.16/zts" + "alpine3.17/zts" ], "version": "8.1.18" }, @@ -54,12 +54,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.18/cli", + "alpine3.18/fpm", + "alpine3.18/zts", "alpine3.17/cli", "alpine3.17/fpm", - "alpine3.17/zts", - "alpine3.16/cli", - "alpine3.16/fpm", - "alpine3.16/zts" + "alpine3.17/zts" ], "version": "8.1.19RC1" }, @@ -76,12 +76,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.18/cli", + "alpine3.18/fpm", + "alpine3.18/zts", "alpine3.17/cli", "alpine3.17/fpm", - "alpine3.17/zts", - "alpine3.16/cli", - "alpine3.16/fpm", - "alpine3.16/zts" + "alpine3.17/zts" ], "version": "8.2.5" }, @@ -98,12 +98,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.18/cli", + "alpine3.18/fpm", + "alpine3.18/zts", "alpine3.17/cli", "alpine3.17/fpm", - "alpine3.17/zts", - "alpine3.16/cli", - "alpine3.16/fpm", - "alpine3.16/zts" + "alpine3.17/zts" ], "version": "8.2.6RC1" } diff --git a/versions.sh b/versions.sh index d7942055..eeba2541 100755 --- a/versions.sh +++ b/versions.sh @@ -87,6 +87,7 @@ for version in "${versions[@]}"; do for suite in \ bullseye \ buster \ + alpine3.18 \ alpine3.17 \ alpine3.16 \ ; do @@ -94,6 +95,10 @@ for version in "${versions[@]}"; do if [ "$rcVersion" = '8.0' ] && [[ "$suite" = alpine* ]] && [ "$suite" != 'alpine3.16' ]; then continue fi + # https://github.com/docker-library/php/pull/1405 + if [ "$suite" = 'alpine3.16' ] && [ "$rcVersion" != '8.0' ]; then + continue + fi for variant in cli apache fpm zts; do if [[ "$suite" = alpine* ]]; then if [ "$variant" = 'apache' ]; then