From 885005e1bf6e167093cabd3e8a69cb9b732a9c94 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 30 May 2025 14:21:49 -0700 Subject: [PATCH] Add Alpine 3.22 (remove Alpine 3.20) --- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- versions.json | 24 +++++++++---------- versions.sh | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) rename 10.3/php8.2/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 10.3/php8.3/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 10.4/php8.3/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 10.4/php8.4/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 10.5-rc/php8.3/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 10.5-rc/php8.4/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 11.0/php8.3/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 11.1/php8.3/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 11.1/php8.4/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 11.2-rc/php8.3/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) rename 11.2-rc/php8.4/{fpm-alpine3.20 => fpm-alpine3.22}/Dockerfile (98%) diff --git a/10.3/php8.2/fpm-alpine3.20/Dockerfile b/10.3/php8.2/fpm-alpine3.22/Dockerfile similarity index 98% rename from 10.3/php8.2/fpm-alpine3.20/Dockerfile rename to 10.3/php8.2/fpm-alpine3.22/Dockerfile index 97a9aa04..04896c91 100644 --- a/10.3/php8.2/fpm-alpine3.20/Dockerfile +++ b/10.3/php8.2/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.20 +FROM php:8.2-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.3/php8.3/fpm-alpine3.20/Dockerfile b/10.3/php8.3/fpm-alpine3.22/Dockerfile similarity index 98% rename from 10.3/php8.3/fpm-alpine3.20/Dockerfile rename to 10.3/php8.3/fpm-alpine3.22/Dockerfile index 576bc8bb..8cac910c 100644 --- a/10.3/php8.3/fpm-alpine3.20/Dockerfile +++ b/10.3/php8.3/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.20 +FROM php:8.3-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.4/php8.3/fpm-alpine3.20/Dockerfile b/10.4/php8.3/fpm-alpine3.22/Dockerfile similarity index 98% rename from 10.4/php8.3/fpm-alpine3.20/Dockerfile rename to 10.4/php8.3/fpm-alpine3.22/Dockerfile index bc805ca8..c4a14509 100644 --- a/10.4/php8.3/fpm-alpine3.20/Dockerfile +++ b/10.4/php8.3/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.20 +FROM php:8.3-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.4/php8.4/fpm-alpine3.20/Dockerfile b/10.4/php8.4/fpm-alpine3.22/Dockerfile similarity index 98% rename from 10.4/php8.4/fpm-alpine3.20/Dockerfile rename to 10.4/php8.4/fpm-alpine3.22/Dockerfile index 5c02af15..f2b5056b 100644 --- a/10.4/php8.4/fpm-alpine3.20/Dockerfile +++ b/10.4/php8.4/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.4-fpm-alpine3.20 +FROM php:8.4-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.5-rc/php8.3/fpm-alpine3.20/Dockerfile b/10.5-rc/php8.3/fpm-alpine3.22/Dockerfile similarity index 98% rename from 10.5-rc/php8.3/fpm-alpine3.20/Dockerfile rename to 10.5-rc/php8.3/fpm-alpine3.22/Dockerfile index 70a0768a..45ddcad7 100644 --- a/10.5-rc/php8.3/fpm-alpine3.20/Dockerfile +++ b/10.5-rc/php8.3/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.20 +FROM php:8.3-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.5-rc/php8.4/fpm-alpine3.20/Dockerfile b/10.5-rc/php8.4/fpm-alpine3.22/Dockerfile similarity index 98% rename from 10.5-rc/php8.4/fpm-alpine3.20/Dockerfile rename to 10.5-rc/php8.4/fpm-alpine3.22/Dockerfile index aaee5ea3..638d7125 100644 --- a/10.5-rc/php8.4/fpm-alpine3.20/Dockerfile +++ b/10.5-rc/php8.4/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.4-fpm-alpine3.20 +FROM php:8.4-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/11.0/php8.3/fpm-alpine3.20/Dockerfile b/11.0/php8.3/fpm-alpine3.22/Dockerfile similarity index 98% rename from 11.0/php8.3/fpm-alpine3.20/Dockerfile rename to 11.0/php8.3/fpm-alpine3.22/Dockerfile index 90dd4235..3f6323f6 100644 --- a/11.0/php8.3/fpm-alpine3.20/Dockerfile +++ b/11.0/php8.3/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.20 +FROM php:8.3-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/11.1/php8.3/fpm-alpine3.20/Dockerfile b/11.1/php8.3/fpm-alpine3.22/Dockerfile similarity index 98% rename from 11.1/php8.3/fpm-alpine3.20/Dockerfile rename to 11.1/php8.3/fpm-alpine3.22/Dockerfile index 5eb7fea9..9515be67 100644 --- a/11.1/php8.3/fpm-alpine3.20/Dockerfile +++ b/11.1/php8.3/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.20 +FROM php:8.3-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/11.1/php8.4/fpm-alpine3.20/Dockerfile b/11.1/php8.4/fpm-alpine3.22/Dockerfile similarity index 98% rename from 11.1/php8.4/fpm-alpine3.20/Dockerfile rename to 11.1/php8.4/fpm-alpine3.22/Dockerfile index e5b4a11f..ead4d14e 100644 --- a/11.1/php8.4/fpm-alpine3.20/Dockerfile +++ b/11.1/php8.4/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.4-fpm-alpine3.20 +FROM php:8.4-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/11.2-rc/php8.3/fpm-alpine3.20/Dockerfile b/11.2-rc/php8.3/fpm-alpine3.22/Dockerfile similarity index 98% rename from 11.2-rc/php8.3/fpm-alpine3.20/Dockerfile rename to 11.2-rc/php8.3/fpm-alpine3.22/Dockerfile index 2454e71d..0904a180 100644 --- a/11.2-rc/php8.3/fpm-alpine3.20/Dockerfile +++ b/11.2-rc/php8.3/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.20 +FROM php:8.3-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/11.2-rc/php8.4/fpm-alpine3.20/Dockerfile b/11.2-rc/php8.4/fpm-alpine3.22/Dockerfile similarity index 98% rename from 11.2-rc/php8.4/fpm-alpine3.20/Dockerfile rename to 11.2-rc/php8.4/fpm-alpine3.22/Dockerfile index 9a8be506..e5d39717 100644 --- a/11.2-rc/php8.4/fpm-alpine3.20/Dockerfile +++ b/11.2-rc/php8.4/fpm-alpine3.22/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.4-fpm-alpine3.20 +FROM php:8.4-fpm-alpine3.22 # install the PHP extensions we need RUN set -eux; \ diff --git a/versions.json b/versions.json index 8bb950c3..6c02263b 100644 --- a/versions.json +++ b/versions.json @@ -14,8 +14,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" + "fpm-alpine3.22", + "fpm-alpine3.21" ], "composer": { "version": "2" @@ -37,8 +37,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" + "fpm-alpine3.22", + "fpm-alpine3.21" ], "composer": { "version": "2" @@ -58,8 +58,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" + "fpm-alpine3.22", + "fpm-alpine3.21" ], "composer": { "version": "2" @@ -80,8 +80,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" + "fpm-alpine3.22", + "fpm-alpine3.21" ], "composer": { "version": "2" @@ -103,8 +103,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" + "fpm-alpine3.22", + "fpm-alpine3.21" ], "composer": { "version": "2" @@ -125,8 +125,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" + "fpm-alpine3.22", + "fpm-alpine3.21" ], "composer": { "version": "2" diff --git a/versions.sh b/versions.sh index a74b71d8..0b94f0ae 100755 --- a/versions.sh +++ b/versions.sh @@ -129,8 +129,8 @@ for version in "${versions[@]}"; do variants: [ "bookworm", "bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", empty | if startswith("alpine") then empty else "apache-" + .