diff --git a/9.5/php8.2/apache-bookworm/Dockerfile b/10.2-rc/php8.2/apache-bookworm/Dockerfile similarity index 98% rename from 9.5/php8.2/apache-bookworm/Dockerfile rename to 10.2-rc/php8.2/apache-bookworm/Dockerfile index 8c900ae7..7a7689ac 100644 --- a/9.5/php8.2/apache-bookworm/Dockerfile +++ b/10.2-rc/php8.2/apache-bookworm/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.2/apache-bullseye/Dockerfile b/10.2-rc/php8.2/apache-bullseye/Dockerfile similarity index 98% rename from 9.5/php8.2/apache-bullseye/Dockerfile rename to 10.2-rc/php8.2/apache-bullseye/Dockerfile index ec36077e..27d9afea 100644 --- a/9.5/php8.2/apache-bullseye/Dockerfile +++ b/10.2-rc/php8.2/apache-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.2/fpm-alpine3.17/Dockerfile b/10.2-rc/php8.2/fpm-alpine3.17/Dockerfile similarity index 98% rename from 9.5/php8.2/fpm-alpine3.17/Dockerfile rename to 10.2-rc/php8.2/fpm-alpine3.17/Dockerfile index 746e5036..f8af3404 100644 --- a/9.5/php8.2/fpm-alpine3.17/Dockerfile +++ b/10.2-rc/php8.2/fpm-alpine3.17/Dockerfile @@ -56,7 +56,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.2/fpm-alpine3.18/Dockerfile b/10.2-rc/php8.2/fpm-alpine3.18/Dockerfile similarity index 98% rename from 9.5/php8.2/fpm-alpine3.18/Dockerfile rename to 10.2-rc/php8.2/fpm-alpine3.18/Dockerfile index 4ec4c0c2..337352cf 100644 --- a/9.5/php8.2/fpm-alpine3.18/Dockerfile +++ b/10.2-rc/php8.2/fpm-alpine3.18/Dockerfile @@ -56,7 +56,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.2/fpm-bookworm/Dockerfile b/10.2-rc/php8.2/fpm-bookworm/Dockerfile similarity index 98% rename from 9.5/php8.2/fpm-bookworm/Dockerfile rename to 10.2-rc/php8.2/fpm-bookworm/Dockerfile index d9f3515f..1b68f783 100644 --- a/9.5/php8.2/fpm-bookworm/Dockerfile +++ b/10.2-rc/php8.2/fpm-bookworm/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.2/fpm-bullseye/Dockerfile b/10.2-rc/php8.2/fpm-bullseye/Dockerfile similarity index 98% rename from 9.5/php8.2/fpm-bullseye/Dockerfile rename to 10.2-rc/php8.2/fpm-bullseye/Dockerfile index f6ef342d..7f8306cd 100644 --- a/9.5/php8.2/fpm-bullseye/Dockerfile +++ b/10.2-rc/php8.2/fpm-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.1/fpm-bookworm/Dockerfile b/10.2-rc/php8.3/apache-bookworm/Dockerfile similarity index 97% rename from 9.5/php8.1/fpm-bookworm/Dockerfile rename to 10.2-rc/php8.3/apache-bookworm/Dockerfile index b1c4319f..7ea0d7b8 100644 --- a/9.5/php8.1/fpm-bookworm/Dockerfile +++ b/10.2-rc/php8.3/apache-bookworm/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-bookworm +FROM php:8.3-apache-bookworm # install the PHP extensions we need RUN set -eux; \ @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.1/fpm-bullseye/Dockerfile b/10.2-rc/php8.3/apache-bullseye/Dockerfile similarity index 97% rename from 9.5/php8.1/fpm-bullseye/Dockerfile rename to 10.2-rc/php8.3/apache-bullseye/Dockerfile index a7f262eb..e8f95f2e 100644 --- a/9.5/php8.1/fpm-bullseye/Dockerfile +++ b/10.2-rc/php8.3/apache-bullseye/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-bullseye +FROM php:8.3-apache-bullseye # install the PHP extensions we need RUN set -eux; \ @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.1/fpm-alpine3.17/Dockerfile b/10.2-rc/php8.3/fpm-alpine3.17/Dockerfile similarity index 96% rename from 9.5/php8.1/fpm-alpine3.17/Dockerfile rename to 10.2-rc/php8.3/fpm-alpine3.17/Dockerfile index d7e8bf52..beb5a503 100644 --- a/9.5/php8.1/fpm-alpine3.17/Dockerfile +++ b/10.2-rc/php8.3/fpm-alpine3.17/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.17 +FROM php:8.3-fpm-alpine3.17 # install the PHP extensions we need RUN set -eux; \ @@ -56,7 +56,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.1/fpm-alpine3.18/Dockerfile b/10.2-rc/php8.3/fpm-alpine3.18/Dockerfile similarity index 96% rename from 9.5/php8.1/fpm-alpine3.18/Dockerfile rename to 10.2-rc/php8.3/fpm-alpine3.18/Dockerfile index 41f076b3..8ad86522 100644 --- a/9.5/php8.1/fpm-alpine3.18/Dockerfile +++ b/10.2-rc/php8.3/fpm-alpine3.18/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.18 +FROM php:8.3-fpm-alpine3.18 # install the PHP extensions we need RUN set -eux; \ @@ -56,7 +56,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.1/apache-bookworm/Dockerfile b/10.2-rc/php8.3/fpm-bookworm/Dockerfile similarity index 97% rename from 9.5/php8.1/apache-bookworm/Dockerfile rename to 10.2-rc/php8.3/fpm-bookworm/Dockerfile index 1ffd09c0..370c6810 100644 --- a/9.5/php8.1/apache-bookworm/Dockerfile +++ b/10.2-rc/php8.3/fpm-bookworm/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-apache-bookworm +FROM php:8.3-fpm-bookworm # install the PHP extensions we need RUN set -eux; \ @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.5/php8.1/apache-bullseye/Dockerfile b/10.2-rc/php8.3/fpm-bullseye/Dockerfile similarity index 97% rename from 9.5/php8.1/apache-bullseye/Dockerfile rename to 10.2-rc/php8.3/fpm-bullseye/Dockerfile index bd164c79..02ea6843 100644 --- a/9.5/php8.1/apache-bullseye/Dockerfile +++ b/10.2-rc/php8.3/fpm-bullseye/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-apache-bullseye +FROM php:8.3-fpm-bullseye # install the PHP extensions we need RUN set -eux; \ @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.5.11 +ENV DRUPAL_VERSION 10.2.0-rc1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index ac8fbd52..9f140c60 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,14 +2,13 @@ set -Eeuo pipefail declare -A aliases=( - [9.5]='9' [10.1]='10 latest' [10.2-rc]='rc' ) defaultDebianSuite='bookworm' declare -A debianSuites=( - #[9.2]='buster' + #[10.0]='bullseye' ) defaultPhpVersion='php8.2' @@ -17,7 +16,6 @@ declare -A defaultPhpVersions=( # https://www.drupal.org/docs/7/system-requirements/php-requirements#php_required [7]='php8.1' # PHP 7.4 & 8.0 are EOL, so we don't have a choice but to update the default # https://www.drupal.org/docs/system-requirements/php-requirements - [9.5]='php8.1' ) self="$(basename "$BASH_SOURCE")" diff --git a/versions.json b/versions.json index 4768130d..9f2e020b 100644 --- a/versions.json +++ b/versions.json @@ -35,11 +35,13 @@ ], "version": "10.1.6" }, - "7": { - "md5": "4139f0feecb44a53645242194809b73a", + "10.2-rc": { + "composer": { + "version": "2" + }, "phpVersions": [ - "8.2", - "8.1" + "8.3", + "8.2" ], "variants": [ "apache-bookworm", @@ -49,12 +51,10 @@ "fpm-alpine3.18", "fpm-alpine3.17" ], - "version": "7.98" + "version": "10.2.0-rc1" }, - "9.5": { - "composer": { - "version": "2" - }, + "7": { + "md5": "4139f0feecb44a53645242194809b73a", "phpVersions": [ "8.2", "8.1" @@ -67,6 +67,6 @@ "fpm-alpine3.18", "fpm-alpine3.17" ], - "version": "9.5.11" + "version": "7.98" } } diff --git a/versions.sh b/versions.sh index bf5add3c..9c52e64f 100755 --- a/versions.sh +++ b/versions.sh @@ -29,8 +29,8 @@ for version in "${versions[@]}"; do drupalRelease="${rcVersion%%.*}.x" ;; *) - # there is no https://updates.drupal.org/release-history/drupal/9.x - # (07/2020) current could also be used for 8.9, 9.x + # there is no https://updates.drupal.org/release-history/drupal/10.x + # (12/2023) current can be used for 10.x: "10.0.,10.1.,10.2." drupalRelease='current' ;; esac @@ -89,8 +89,11 @@ for version in "${versions[@]}"; do version: env.fullVersion, phpVersions: ( [ + # https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps + # Drupal now supports PHP 8.3 and recommends at least PHP 8.2. + if [ "7", "10.0", "10.1" ] | index(env.version) then empty else "8.3" end, "8.2", - "8.1", + if [ "7", "10.0", "10.1" ] | index(env.version) then "8.1" else empty end, # https://www.drupal.org/docs/system-requirements/php-requirements # https://www.drupal.org/docs/7/system-requirements/php-requirements empty