From 746a68f3e21d1775f23701011503ca98ac900721 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 May 2023 09:15:29 -0700 Subject: [PATCH] Update to Alpine 3.18 --- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- apply-templates.sh | 5 ++- versions.json | 7 +++- versions.sh | 42 ++++++++++--------- 7 files changed, 36 insertions(+), 26 deletions(-) rename 10.0/php8.1/{fpm-alpine3.16 => fpm-alpine3.18}/Dockerfile (98%) rename 10.0/php8.2/{fpm-alpine3.16 => fpm-alpine3.18}/Dockerfile (98%) rename 9.4/php8.1/{fpm-alpine3.16 => fpm-alpine3.18}/Dockerfile (98%) rename 9.5/php8.1/{fpm-alpine3.16 => fpm-alpine3.18}/Dockerfile (98%) diff --git a/10.0/php8.1/fpm-alpine3.16/Dockerfile b/10.0/php8.1/fpm-alpine3.18/Dockerfile similarity index 98% rename from 10.0/php8.1/fpm-alpine3.16/Dockerfile rename to 10.0/php8.1/fpm-alpine3.18/Dockerfile index 33742a48c..672908750 100644 --- a/10.0/php8.1/fpm-alpine3.16/Dockerfile +++ b/10.0/php8.1/fpm-alpine3.18/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.16 +FROM php:8.1-fpm-alpine3.18 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.0/php8.2/fpm-alpine3.16/Dockerfile b/10.0/php8.2/fpm-alpine3.18/Dockerfile similarity index 98% rename from 10.0/php8.2/fpm-alpine3.16/Dockerfile rename to 10.0/php8.2/fpm-alpine3.18/Dockerfile index 57913f231..161770e7c 100644 --- a/10.0/php8.2/fpm-alpine3.16/Dockerfile +++ b/10.0/php8.2/fpm-alpine3.18/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.16 +FROM php:8.2-fpm-alpine3.18 # install the PHP extensions we need RUN set -eux; \ diff --git a/9.4/php8.1/fpm-alpine3.16/Dockerfile b/9.4/php8.1/fpm-alpine3.18/Dockerfile similarity index 98% rename from 9.4/php8.1/fpm-alpine3.16/Dockerfile rename to 9.4/php8.1/fpm-alpine3.18/Dockerfile index e923dcf30..0dbda34b8 100644 --- a/9.4/php8.1/fpm-alpine3.16/Dockerfile +++ b/9.4/php8.1/fpm-alpine3.18/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.16 +FROM php:8.1-fpm-alpine3.18 # install the PHP extensions we need RUN set -eux; \ diff --git a/9.5/php8.1/fpm-alpine3.16/Dockerfile b/9.5/php8.1/fpm-alpine3.18/Dockerfile similarity index 98% rename from 9.5/php8.1/fpm-alpine3.16/Dockerfile rename to 9.5/php8.1/fpm-alpine3.18/Dockerfile index 544d91a8f..7465d0335 100644 --- a/9.5/php8.1/fpm-alpine3.16/Dockerfile +++ b/9.5/php8.1/fpm-alpine3.18/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.16 +FROM php:8.1-fpm-alpine3.18 # install the PHP extensions we need RUN set -eux; \ diff --git a/apply-templates.sh b/apply-templates.sh index c6910afc3..96e77c7f8 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -43,7 +43,10 @@ for version; do for variant in "${variants[@]}"; do export variant - # https://github.com/docker-library/php/blob/d4616116cbeda0937d08ef89ef27b67c5156befd/versions.sh#L93-L96 + # https://github.com/docker-library/php/blob/0a68eaa2d3a269079c687e55abc960c77d3a134e/versions.sh#L94-L101 + if [[ "$variant" = *-'alpine3.16' ]] && [ "$phpVersion" != '8.0' ]; then + continue + fi if [ "$phpVersion" = '8.0' ] && [[ "$variant" = *-alpine* ]] && [[ "$variant" != *-'alpine3.16' ]]; then continue fi diff --git a/versions.json b/versions.json index cbf851ff9..2a4d22995 100644 --- a/versions.json +++ b/versions.json @@ -12,8 +12,8 @@ "fpm-bullseye", "apache-buster", "fpm-buster", - "fpm-alpine3.17", - "fpm-alpine3.16" + "fpm-alpine3.18", + "fpm-alpine3.17" ], "version": "10.0.9" }, @@ -27,6 +27,7 @@ "fpm-bullseye", "apache-buster", "fpm-buster", + "fpm-alpine3.18", "fpm-alpine3.17", "fpm-alpine3.16" ], @@ -45,6 +46,7 @@ "fpm-bullseye", "apache-buster", "fpm-buster", + "fpm-alpine3.18", "fpm-alpine3.17", "fpm-alpine3.16" ], @@ -63,6 +65,7 @@ "fpm-bullseye", "apache-buster", "fpm-buster", + "fpm-alpine3.18", "fpm-alpine3.17", "fpm-alpine3.16" ], diff --git a/versions.sh b/versions.sh index 17bfc1c2c..3eb01a36f 100755 --- a/versions.sh +++ b/versions.sh @@ -84,30 +84,34 @@ for version in "${versions[@]}"; do export fullVersion json="$( jq <<<"$json" -c --argjson doc "$doc" ' - .[env.version] = { - version: env.fullVersion, - variants: [ + .[env.version] = ( + { + version: env.fullVersion, + phpVersions: ( + # https://www.drupal.org/docs/system-requirements/php-requirements + # https://www.drupal.org/docs/7/system-requirements/php-requirements + if env.version == "7" then + [ "8.0" ] + elif env.version | startswith("9.") then + [ "8.1", "8.0" ] + else + # https://www.drupal.org/node/3264830 + # Require PHP 8.1 for Drupal 10 + [ "8.2", "8.1" ] + end + ), + } + $doc + | .variants = [ "bullseye", "buster", + "alpine3.18", "alpine3.17", - "alpine3.16" + if .phpVersions | index("8.0") then "alpine3.16" else empty end, # https://github.com/docker-library/php/blob/0a68eaa2d3a269079c687e55abc960c77d3a134e/versions.sh#L94-L101 + empty | if startswith("alpine") then empty else "apache-" + . end, "fpm-" + . - ], - phpVersions: ( - # https://www.drupal.org/docs/system-requirements/php-requirements - # https://www.drupal.org/docs/7/system-requirements/php-requirements - if env.version == "7" then - [ "8.0" ] - elif env.version | startswith("9.") then - [ "8.1", "8.0" ] - else - # https://www.drupal.org/node/3264830 - # Require PHP 8.1 for Drupal 10 - [ "8.2", "8.1" ] - end - ), - } + $doc + ] + ) ' )" done