diff --git a/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.16/cli/Dockerfile similarity index 99% rename from 7.4/alpine3.14/cli/Dockerfile rename to 7.4/alpine3.16/cli/Dockerfile index d5e6ea683f..adaa59ef33 100644 --- a/7.4/alpine3.14/cli/Dockerfile +++ b/7.4/alpine3.16/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/7.4/alpine3.14/cli/docker-php-entrypoint b/7.4/alpine3.16/cli/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.14/cli/docker-php-entrypoint rename to 7.4/alpine3.16/cli/docker-php-entrypoint diff --git a/7.4/alpine3.14/cli/docker-php-ext-configure b/7.4/alpine3.16/cli/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.14/cli/docker-php-ext-configure rename to 7.4/alpine3.16/cli/docker-php-ext-configure diff --git a/7.4/alpine3.14/cli/docker-php-ext-enable b/7.4/alpine3.16/cli/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.14/cli/docker-php-ext-enable rename to 7.4/alpine3.16/cli/docker-php-ext-enable diff --git a/7.4/alpine3.14/cli/docker-php-ext-install b/7.4/alpine3.16/cli/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.14/cli/docker-php-ext-install rename to 7.4/alpine3.16/cli/docker-php-ext-install diff --git a/7.4/alpine3.14/cli/docker-php-source b/7.4/alpine3.16/cli/docker-php-source similarity index 100% rename from 7.4/alpine3.14/cli/docker-php-source rename to 7.4/alpine3.16/cli/docker-php-source diff --git a/7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.16/fpm/Dockerfile similarity index 99% rename from 7.4/alpine3.14/fpm/Dockerfile rename to 7.4/alpine3.16/fpm/Dockerfile index 41d6806447..3554f801c8 100644 --- a/7.4/alpine3.14/fpm/Dockerfile +++ b/7.4/alpine3.16/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/7.4/alpine3.14/fpm/docker-php-entrypoint b/7.4/alpine3.16/fpm/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.14/fpm/docker-php-entrypoint rename to 7.4/alpine3.16/fpm/docker-php-entrypoint diff --git a/7.4/alpine3.14/fpm/docker-php-ext-configure b/7.4/alpine3.16/fpm/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.14/fpm/docker-php-ext-configure rename to 7.4/alpine3.16/fpm/docker-php-ext-configure diff --git a/7.4/alpine3.14/fpm/docker-php-ext-enable b/7.4/alpine3.16/fpm/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.14/fpm/docker-php-ext-enable rename to 7.4/alpine3.16/fpm/docker-php-ext-enable diff --git a/7.4/alpine3.14/fpm/docker-php-ext-install b/7.4/alpine3.16/fpm/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.14/fpm/docker-php-ext-install rename to 7.4/alpine3.16/fpm/docker-php-ext-install diff --git a/7.4/alpine3.14/fpm/docker-php-source b/7.4/alpine3.16/fpm/docker-php-source similarity index 100% rename from 7.4/alpine3.14/fpm/docker-php-source rename to 7.4/alpine3.16/fpm/docker-php-source diff --git a/7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.16/zts/Dockerfile similarity index 99% rename from 7.4/alpine3.14/zts/Dockerfile rename to 7.4/alpine3.16/zts/Dockerfile index 0b45c986b6..3da73db266 100644 --- a/7.4/alpine3.14/zts/Dockerfile +++ b/7.4/alpine3.16/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/7.4/alpine3.14/zts/docker-php-entrypoint b/7.4/alpine3.16/zts/docker-php-entrypoint similarity index 100% rename from 7.4/alpine3.14/zts/docker-php-entrypoint rename to 7.4/alpine3.16/zts/docker-php-entrypoint diff --git a/7.4/alpine3.14/zts/docker-php-ext-configure b/7.4/alpine3.16/zts/docker-php-ext-configure similarity index 100% rename from 7.4/alpine3.14/zts/docker-php-ext-configure rename to 7.4/alpine3.16/zts/docker-php-ext-configure diff --git a/7.4/alpine3.14/zts/docker-php-ext-enable b/7.4/alpine3.16/zts/docker-php-ext-enable similarity index 100% rename from 7.4/alpine3.14/zts/docker-php-ext-enable rename to 7.4/alpine3.16/zts/docker-php-ext-enable diff --git a/7.4/alpine3.14/zts/docker-php-ext-install b/7.4/alpine3.16/zts/docker-php-ext-install similarity index 100% rename from 7.4/alpine3.14/zts/docker-php-ext-install rename to 7.4/alpine3.16/zts/docker-php-ext-install diff --git a/7.4/alpine3.14/zts/docker-php-source b/7.4/alpine3.16/zts/docker-php-source similarity index 100% rename from 7.4/alpine3.14/zts/docker-php-source rename to 7.4/alpine3.16/zts/docker-php-source diff --git a/8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.16/cli/Dockerfile similarity index 99% rename from 8.0/alpine3.14/cli/Dockerfile rename to 8.0/alpine3.16/cli/Dockerfile index 8a1ca1933d..f1b18794b2 100644 --- a/8.0/alpine3.14/cli/Dockerfile +++ b/8.0/alpine3.16/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.0/alpine3.14/cli/docker-php-entrypoint b/8.0/alpine3.16/cli/docker-php-entrypoint similarity index 100% rename from 8.0/alpine3.14/cli/docker-php-entrypoint rename to 8.0/alpine3.16/cli/docker-php-entrypoint diff --git a/8.0/alpine3.14/cli/docker-php-ext-configure b/8.0/alpine3.16/cli/docker-php-ext-configure similarity index 100% rename from 8.0/alpine3.14/cli/docker-php-ext-configure rename to 8.0/alpine3.16/cli/docker-php-ext-configure diff --git a/8.0/alpine3.14/cli/docker-php-ext-enable b/8.0/alpine3.16/cli/docker-php-ext-enable similarity index 100% rename from 8.0/alpine3.14/cli/docker-php-ext-enable rename to 8.0/alpine3.16/cli/docker-php-ext-enable diff --git a/8.0/alpine3.14/cli/docker-php-ext-install b/8.0/alpine3.16/cli/docker-php-ext-install similarity index 100% rename from 8.0/alpine3.14/cli/docker-php-ext-install rename to 8.0/alpine3.16/cli/docker-php-ext-install diff --git a/8.0/alpine3.14/cli/docker-php-source b/8.0/alpine3.16/cli/docker-php-source similarity index 100% rename from 8.0/alpine3.14/cli/docker-php-source rename to 8.0/alpine3.16/cli/docker-php-source diff --git a/8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.16/fpm/Dockerfile similarity index 99% rename from 8.0/alpine3.14/fpm/Dockerfile rename to 8.0/alpine3.16/fpm/Dockerfile index 87a33ee095..1d8f623e39 100644 --- a/8.0/alpine3.14/fpm/Dockerfile +++ b/8.0/alpine3.16/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.0/alpine3.14/fpm/docker-php-entrypoint b/8.0/alpine3.16/fpm/docker-php-entrypoint similarity index 100% rename from 8.0/alpine3.14/fpm/docker-php-entrypoint rename to 8.0/alpine3.16/fpm/docker-php-entrypoint diff --git a/8.0/alpine3.14/fpm/docker-php-ext-configure b/8.0/alpine3.16/fpm/docker-php-ext-configure similarity index 100% rename from 8.0/alpine3.14/fpm/docker-php-ext-configure rename to 8.0/alpine3.16/fpm/docker-php-ext-configure diff --git a/8.0/alpine3.14/fpm/docker-php-ext-enable b/8.0/alpine3.16/fpm/docker-php-ext-enable similarity index 100% rename from 8.0/alpine3.14/fpm/docker-php-ext-enable rename to 8.0/alpine3.16/fpm/docker-php-ext-enable diff --git a/8.0/alpine3.14/fpm/docker-php-ext-install b/8.0/alpine3.16/fpm/docker-php-ext-install similarity index 100% rename from 8.0/alpine3.14/fpm/docker-php-ext-install rename to 8.0/alpine3.16/fpm/docker-php-ext-install diff --git a/8.0/alpine3.14/fpm/docker-php-source b/8.0/alpine3.16/fpm/docker-php-source similarity index 100% rename from 8.0/alpine3.14/fpm/docker-php-source rename to 8.0/alpine3.16/fpm/docker-php-source diff --git a/8.0/alpine3.14/zts/Dockerfile b/8.0/alpine3.16/zts/Dockerfile similarity index 99% rename from 8.0/alpine3.14/zts/Dockerfile rename to 8.0/alpine3.16/zts/Dockerfile index d9e9a019b8..fb27559267 100644 --- a/8.0/alpine3.14/zts/Dockerfile +++ b/8.0/alpine3.16/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/8.0/alpine3.14/zts/docker-php-entrypoint b/8.0/alpine3.16/zts/docker-php-entrypoint similarity index 100% rename from 8.0/alpine3.14/zts/docker-php-entrypoint rename to 8.0/alpine3.16/zts/docker-php-entrypoint diff --git a/8.0/alpine3.14/zts/docker-php-ext-configure b/8.0/alpine3.16/zts/docker-php-ext-configure similarity index 100% rename from 8.0/alpine3.14/zts/docker-php-ext-configure rename to 8.0/alpine3.16/zts/docker-php-ext-configure diff --git a/8.0/alpine3.14/zts/docker-php-ext-enable b/8.0/alpine3.16/zts/docker-php-ext-enable similarity index 100% rename from 8.0/alpine3.14/zts/docker-php-ext-enable rename to 8.0/alpine3.16/zts/docker-php-ext-enable diff --git a/8.0/alpine3.14/zts/docker-php-ext-install b/8.0/alpine3.16/zts/docker-php-ext-install similarity index 100% rename from 8.0/alpine3.14/zts/docker-php-ext-install rename to 8.0/alpine3.16/zts/docker-php-ext-install diff --git a/8.0/alpine3.14/zts/docker-php-source b/8.0/alpine3.16/zts/docker-php-source similarity index 100% rename from 8.0/alpine3.14/zts/docker-php-source rename to 8.0/alpine3.16/zts/docker-php-source diff --git a/8.1/alpine3.14/cli/Dockerfile b/8.1/alpine3.16/cli/Dockerfile similarity index 99% rename from 8.1/alpine3.14/cli/Dockerfile rename to 8.1/alpine3.16/cli/Dockerfile index afd9802ef4..7ba33eeaec 100644 --- a/8.1/alpine3.14/cli/Dockerfile +++ b/8.1/alpine3.16/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # 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.14/cli/docker-php-entrypoint b/8.1/alpine3.16/cli/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.14/cli/docker-php-entrypoint rename to 8.1/alpine3.16/cli/docker-php-entrypoint diff --git a/8.1/alpine3.14/cli/docker-php-ext-configure b/8.1/alpine3.16/cli/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.14/cli/docker-php-ext-configure rename to 8.1/alpine3.16/cli/docker-php-ext-configure diff --git a/8.1/alpine3.14/cli/docker-php-ext-enable b/8.1/alpine3.16/cli/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.14/cli/docker-php-ext-enable rename to 8.1/alpine3.16/cli/docker-php-ext-enable diff --git a/8.1/alpine3.14/cli/docker-php-ext-install b/8.1/alpine3.16/cli/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.14/cli/docker-php-ext-install rename to 8.1/alpine3.16/cli/docker-php-ext-install diff --git a/8.1/alpine3.14/cli/docker-php-source b/8.1/alpine3.16/cli/docker-php-source similarity index 100% rename from 8.1/alpine3.14/cli/docker-php-source rename to 8.1/alpine3.16/cli/docker-php-source diff --git a/8.1/alpine3.14/fpm/Dockerfile b/8.1/alpine3.16/fpm/Dockerfile similarity index 99% rename from 8.1/alpine3.14/fpm/Dockerfile rename to 8.1/alpine3.16/fpm/Dockerfile index 5016b0d4b0..769d8793dd 100644 --- a/8.1/alpine3.14/fpm/Dockerfile +++ b/8.1/alpine3.16/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # 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.14/fpm/docker-php-entrypoint b/8.1/alpine3.16/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.14/fpm/docker-php-entrypoint rename to 8.1/alpine3.16/fpm/docker-php-entrypoint diff --git a/8.1/alpine3.14/fpm/docker-php-ext-configure b/8.1/alpine3.16/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.14/fpm/docker-php-ext-configure rename to 8.1/alpine3.16/fpm/docker-php-ext-configure diff --git a/8.1/alpine3.14/fpm/docker-php-ext-enable b/8.1/alpine3.16/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.14/fpm/docker-php-ext-enable rename to 8.1/alpine3.16/fpm/docker-php-ext-enable diff --git a/8.1/alpine3.14/fpm/docker-php-ext-install b/8.1/alpine3.16/fpm/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.14/fpm/docker-php-ext-install rename to 8.1/alpine3.16/fpm/docker-php-ext-install diff --git a/8.1/alpine3.14/fpm/docker-php-source b/8.1/alpine3.16/fpm/docker-php-source similarity index 100% rename from 8.1/alpine3.14/fpm/docker-php-source rename to 8.1/alpine3.16/fpm/docker-php-source diff --git a/8.1/alpine3.14/zts/Dockerfile b/8.1/alpine3.16/zts/Dockerfile similarity index 99% rename from 8.1/alpine3.14/zts/Dockerfile rename to 8.1/alpine3.16/zts/Dockerfile index c5b2cc6dcd..1bd96f4ce9 100644 --- a/8.1/alpine3.14/zts/Dockerfile +++ b/8.1/alpine3.16/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 # 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.14/zts/docker-php-entrypoint b/8.1/alpine3.16/zts/docker-php-entrypoint similarity index 100% rename from 8.1/alpine3.14/zts/docker-php-entrypoint rename to 8.1/alpine3.16/zts/docker-php-entrypoint diff --git a/8.1/alpine3.14/zts/docker-php-ext-configure b/8.1/alpine3.16/zts/docker-php-ext-configure similarity index 100% rename from 8.1/alpine3.14/zts/docker-php-ext-configure rename to 8.1/alpine3.16/zts/docker-php-ext-configure diff --git a/8.1/alpine3.14/zts/docker-php-ext-enable b/8.1/alpine3.16/zts/docker-php-ext-enable similarity index 100% rename from 8.1/alpine3.14/zts/docker-php-ext-enable rename to 8.1/alpine3.16/zts/docker-php-ext-enable diff --git a/8.1/alpine3.14/zts/docker-php-ext-install b/8.1/alpine3.16/zts/docker-php-ext-install similarity index 100% rename from 8.1/alpine3.14/zts/docker-php-ext-install rename to 8.1/alpine3.16/zts/docker-php-ext-install diff --git a/8.1/alpine3.14/zts/docker-php-source b/8.1/alpine3.16/zts/docker-php-source similarity index 100% rename from 8.1/alpine3.14/zts/docker-php-source rename to 8.1/alpine3.16/zts/docker-php-source diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 1b42ddc047..9a33f842eb 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,9 +10,9 @@ defaultDebianSuite='bullseye' declare -A debianSuites=( #[7.4]='buster' ) -defaultAlpineVersion='3.15' +defaultAlpineVersion='3.16' declare -A alpineVersions=( - #[8.1]='3.15' + #[8.1]='3.16' ) self="$(basename "$BASH_SOURCE")" diff --git a/versions.json b/versions.json index 9201a0b381..b691e19b64 100644 --- a/versions.json +++ b/versions.json @@ -12,12 +12,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.16/cli", + "alpine3.16/fpm", + "alpine3.16/zts", "alpine3.15/cli", "alpine3.15/fpm", - "alpine3.15/zts", - "alpine3.14/cli", - "alpine3.14/fpm", - "alpine3.14/zts" + "alpine3.15/zts" ], "version": "7.4.29" }, @@ -35,12 +35,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.16/cli", + "alpine3.16/fpm", + "alpine3.16/zts", "alpine3.15/cli", "alpine3.15/fpm", - "alpine3.15/zts", - "alpine3.14/cli", - "alpine3.14/fpm", - "alpine3.14/zts" + "alpine3.15/zts" ], "version": "8.0.19" }, @@ -58,12 +58,12 @@ "buster/apache", "buster/fpm", "buster/zts", + "alpine3.16/cli", + "alpine3.16/fpm", + "alpine3.16/zts", "alpine3.15/cli", "alpine3.15/fpm", - "alpine3.15/zts", - "alpine3.14/cli", - "alpine3.14/fpm", - "alpine3.14/zts" + "alpine3.15/zts" ], "version": "8.1.6" }, diff --git a/versions.sh b/versions.sh index 144a1bee87..6317f51681 100755 --- a/versions.sh +++ b/versions.sh @@ -87,8 +87,8 @@ for version in "${versions[@]}"; do for suite in \ bullseye \ buster \ + alpine3.16 \ alpine3.15 \ - alpine3.14 \ ; do for variant in cli apache fpm zts; do if [[ "$suite" = alpine* ]]; then