From 19559d62d44c5b3d7fe69a957e6154da08300fd9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 16 Dec 2022 09:44:50 -0800 Subject: [PATCH] Add 9.5, remove (EOL) 9.3, add (10+) PHP 8.2, update defaults --- 10.0-rc/php8.2/apache-bullseye/Dockerfile | 84 +++++++++++++++++++ 10.0-rc/php8.2/apache-buster/Dockerfile | 84 +++++++++++++++++++ 10.0-rc/php8.2/fpm-alpine3.16/Dockerfile | 74 ++++++++++++++++ 10.0-rc/php8.2/fpm-alpine3.17/Dockerfile | 74 ++++++++++++++++ 10.0-rc/php8.2/fpm-bullseye/Dockerfile | 84 +++++++++++++++++++ 10.0-rc/php8.2/fpm-buster/Dockerfile | 84 +++++++++++++++++++ .../php8.0/apache-bullseye/Dockerfile | 2 +- {9.3 => 9.5}/php8.0/apache-buster/Dockerfile | 2 +- {9.3 => 9.5}/php8.0/fpm-alpine3.16/Dockerfile | 2 +- {9.3 => 9.5}/php8.0/fpm-bullseye/Dockerfile | 2 +- {9.3 => 9.5}/php8.0/fpm-buster/Dockerfile | 2 +- .../php8.1/apache-bullseye/Dockerfile | 2 +- {9.3 => 9.5}/php8.1/apache-buster/Dockerfile | 2 +- {9.3 => 9.5}/php8.1/fpm-alpine3.16/Dockerfile | 2 +- {9.3 => 9.5}/php8.1/fpm-alpine3.17/Dockerfile | 2 +- {9.3 => 9.5}/php8.1/fpm-bullseye/Dockerfile | 2 +- {9.3 => 9.5}/php8.1/fpm-buster/Dockerfile | 2 +- generate-stackbrew-library.sh | 8 +- versions.json | 9 +- versions.sh | 2 +- 20 files changed, 505 insertions(+), 20 deletions(-) create mode 100644 10.0-rc/php8.2/apache-bullseye/Dockerfile create mode 100644 10.0-rc/php8.2/apache-buster/Dockerfile create mode 100644 10.0-rc/php8.2/fpm-alpine3.16/Dockerfile create mode 100644 10.0-rc/php8.2/fpm-alpine3.17/Dockerfile create mode 100644 10.0-rc/php8.2/fpm-bullseye/Dockerfile create mode 100644 10.0-rc/php8.2/fpm-buster/Dockerfile rename {9.3 => 9.5}/php8.0/apache-bullseye/Dockerfile (98%) rename {9.3 => 9.5}/php8.0/apache-buster/Dockerfile (98%) rename {9.3 => 9.5}/php8.0/fpm-alpine3.16/Dockerfile (98%) rename {9.3 => 9.5}/php8.0/fpm-bullseye/Dockerfile (98%) rename {9.3 => 9.5}/php8.0/fpm-buster/Dockerfile (98%) rename {9.3 => 9.5}/php8.1/apache-bullseye/Dockerfile (98%) rename {9.3 => 9.5}/php8.1/apache-buster/Dockerfile (98%) rename {9.3 => 9.5}/php8.1/fpm-alpine3.16/Dockerfile (98%) rename {9.3 => 9.5}/php8.1/fpm-alpine3.17/Dockerfile (98%) rename {9.3 => 9.5}/php8.1/fpm-bullseye/Dockerfile (98%) rename {9.3 => 9.5}/php8.1/fpm-buster/Dockerfile (98%) diff --git a/10.0-rc/php8.2/apache-bullseye/Dockerfile b/10.0-rc/php8.2/apache-bullseye/Dockerfile new file mode 100644 index 000000000..45cef2697 --- /dev/null +++ b/10.0-rc/php8.2/apache-bullseye/Dockerfile @@ -0,0 +1,84 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.2-apache-bullseye + +# install the PHP extensions we need +RUN set -eux; \ + \ + if command -v a2enmod; then \ + a2enmod rewrite; \ + fi; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libfreetype6-dev \ + libjpeg-dev \ + libpng-dev \ + libpq-dev \ + libwebp-dev \ + libzip-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ +# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 10.0.0-rc3 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/10.0-rc/php8.2/apache-buster/Dockerfile b/10.0-rc/php8.2/apache-buster/Dockerfile new file mode 100644 index 000000000..0c2580b83 --- /dev/null +++ b/10.0-rc/php8.2/apache-buster/Dockerfile @@ -0,0 +1,84 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.2-apache-buster + +# install the PHP extensions we need +RUN set -eux; \ + \ + if command -v a2enmod; then \ + a2enmod rewrite; \ + fi; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libfreetype6-dev \ + libjpeg-dev \ + libpng-dev \ + libpq-dev \ + libwebp-dev \ + libzip-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ +# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 10.0.0-rc3 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/10.0-rc/php8.2/fpm-alpine3.16/Dockerfile b/10.0-rc/php8.2/fpm-alpine3.16/Dockerfile new file mode 100644 index 000000000..c97c119fd --- /dev/null +++ b/10.0-rc/php8.2/fpm-alpine3.16/Dockerfile @@ -0,0 +1,74 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.2-fpm-alpine3.16 + +# install the PHP extensions we need +RUN set -eux; \ + \ + apk add --no-cache --virtual .build-deps \ + coreutils \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libwebp-dev \ + libzip-dev \ +# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642 + postgresql-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr/include \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \ + apk del --no-network .build-deps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 10.0.0-rc3 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/10.0-rc/php8.2/fpm-alpine3.17/Dockerfile b/10.0-rc/php8.2/fpm-alpine3.17/Dockerfile new file mode 100644 index 000000000..68431fdff --- /dev/null +++ b/10.0-rc/php8.2/fpm-alpine3.17/Dockerfile @@ -0,0 +1,74 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.2-fpm-alpine3.17 + +# install the PHP extensions we need +RUN set -eux; \ + \ + apk add --no-cache --virtual .build-deps \ + coreutils \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libwebp-dev \ + libzip-dev \ +# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642 + postgresql-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr/include \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \ + apk del --no-network .build-deps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 10.0.0-rc3 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/10.0-rc/php8.2/fpm-bullseye/Dockerfile b/10.0-rc/php8.2/fpm-bullseye/Dockerfile new file mode 100644 index 000000000..a0991550b --- /dev/null +++ b/10.0-rc/php8.2/fpm-bullseye/Dockerfile @@ -0,0 +1,84 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.2-fpm-bullseye + +# install the PHP extensions we need +RUN set -eux; \ + \ + if command -v a2enmod; then \ + a2enmod rewrite; \ + fi; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libfreetype6-dev \ + libjpeg-dev \ + libpng-dev \ + libpq-dev \ + libwebp-dev \ + libzip-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ +# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 10.0.0-rc3 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/10.0-rc/php8.2/fpm-buster/Dockerfile b/10.0-rc/php8.2/fpm-buster/Dockerfile new file mode 100644 index 000000000..8e5bebccc --- /dev/null +++ b/10.0-rc/php8.2/fpm-buster/Dockerfile @@ -0,0 +1,84 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.2-fpm-buster + +# install the PHP extensions we need +RUN set -eux; \ + \ + if command -v a2enmod; then \ + a2enmod rewrite; \ + fi; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libfreetype6-dev \ + libjpeg-dev \ + libpng-dev \ + libpq-dev \ + libwebp-dev \ + libzip-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ +# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 10.0.0-rc3 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/9.3/php8.0/apache-bullseye/Dockerfile b/9.5/php8.0/apache-bullseye/Dockerfile similarity index 98% rename from 9.3/php8.0/apache-bullseye/Dockerfile rename to 9.5/php8.0/apache-bullseye/Dockerfile index d379c55ba..ddcb4b406 100644 --- a/9.3/php8.0/apache-bullseye/Dockerfile +++ b/9.5/php8.0/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/apache-buster/Dockerfile b/9.5/php8.0/apache-buster/Dockerfile similarity index 98% rename from 9.3/php8.0/apache-buster/Dockerfile rename to 9.5/php8.0/apache-buster/Dockerfile index 9fb168b58..e34f430c4 100644 --- a/9.3/php8.0/apache-buster/Dockerfile +++ b/9.5/php8.0/apache-buster/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-alpine3.16/Dockerfile b/9.5/php8.0/fpm-alpine3.16/Dockerfile similarity index 98% rename from 9.3/php8.0/fpm-alpine3.16/Dockerfile rename to 9.5/php8.0/fpm-alpine3.16/Dockerfile index 08ae706c2..39982028b 100644 --- a/9.3/php8.0/fpm-alpine3.16/Dockerfile +++ b/9.5/php8.0/fpm-alpine3.16/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-bullseye/Dockerfile b/9.5/php8.0/fpm-bullseye/Dockerfile similarity index 98% rename from 9.3/php8.0/fpm-bullseye/Dockerfile rename to 9.5/php8.0/fpm-bullseye/Dockerfile index 6520d517f..c12806e6e 100644 --- a/9.3/php8.0/fpm-bullseye/Dockerfile +++ b/9.5/php8.0/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-buster/Dockerfile b/9.5/php8.0/fpm-buster/Dockerfile similarity index 98% rename from 9.3/php8.0/fpm-buster/Dockerfile rename to 9.5/php8.0/fpm-buster/Dockerfile index c8d1c1d51..b668434d7 100644 --- a/9.3/php8.0/fpm-buster/Dockerfile +++ b/9.5/php8.0/fpm-buster/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/apache-bullseye/Dockerfile b/9.5/php8.1/apache-bullseye/Dockerfile similarity index 98% rename from 9.3/php8.1/apache-bullseye/Dockerfile rename to 9.5/php8.1/apache-bullseye/Dockerfile index 2fc65db52..8e1c00919 100644 --- a/9.3/php8.1/apache-bullseye/Dockerfile +++ b/9.5/php8.1/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/apache-buster/Dockerfile b/9.5/php8.1/apache-buster/Dockerfile similarity index 98% rename from 9.3/php8.1/apache-buster/Dockerfile rename to 9.5/php8.1/apache-buster/Dockerfile index d3bd0256c..94fa78068 100644 --- a/9.3/php8.1/apache-buster/Dockerfile +++ b/9.5/php8.1/apache-buster/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-alpine3.16/Dockerfile b/9.5/php8.1/fpm-alpine3.16/Dockerfile similarity index 98% rename from 9.3/php8.1/fpm-alpine3.16/Dockerfile rename to 9.5/php8.1/fpm-alpine3.16/Dockerfile index f693ffcdd..ee1bf20f9 100644 --- a/9.3/php8.1/fpm-alpine3.16/Dockerfile +++ b/9.5/php8.1/fpm-alpine3.16/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-alpine3.17/Dockerfile b/9.5/php8.1/fpm-alpine3.17/Dockerfile similarity index 98% rename from 9.3/php8.1/fpm-alpine3.17/Dockerfile rename to 9.5/php8.1/fpm-alpine3.17/Dockerfile index 2a50025d0..79cba14ed 100644 --- a/9.3/php8.1/fpm-alpine3.17/Dockerfile +++ b/9.5/php8.1/fpm-alpine3.17/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-bullseye/Dockerfile b/9.5/php8.1/fpm-bullseye/Dockerfile similarity index 98% rename from 9.3/php8.1/fpm-bullseye/Dockerfile rename to 9.5/php8.1/fpm-bullseye/Dockerfile index 37538fbb5..5a5e54d40 100644 --- a/9.3/php8.1/fpm-bullseye/Dockerfile +++ b/9.5/php8.1/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-buster/Dockerfile b/9.5/php8.1/fpm-buster/Dockerfile similarity index 98% rename from 9.3/php8.1/fpm-buster/Dockerfile rename to 9.5/php8.1/fpm-buster/Dockerfile index 3b2c9cd6d..c641fc4e5 100644 --- a/9.3/php8.1/fpm-buster/Dockerfile +++ b/9.5/php8.1/fpm-buster/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.3.22 +ENV DRUPAL_VERSION 9.5.0 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 22d6fc3ed..dbae4db78 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [9.4]='9 latest' + [9.5]='9 latest' [10.0-rc]='rc' ) @@ -11,13 +11,13 @@ declare -A debianSuites=( #[9.2]='buster' ) -defaultPhpVersion='php8.1' +defaultPhpVersion='php8.2' declare -A defaultPhpVersions=( # https://www.drupal.org/docs/7/system-requirements/php-requirements#php_required [7]='php8.0' # PHP 7.4 is EOL, so we don't have a choice but to update the default # https://www.drupal.org/docs/system-requirements/php-requirements - [9.3]='php8.0' - [9.4]='php8.0' + [9.4]='php8.1' + [9.5]='php8.1' ) self="$(basename "$BASH_SOURCE")" diff --git a/versions.json b/versions.json index f112f7d95..fb1350bf5 100644 --- a/versions.json +++ b/versions.json @@ -4,6 +4,7 @@ "version": "2" }, "phpVersions": [ + "8.2", "8.1" ], "variants": [ @@ -31,7 +32,7 @@ ], "version": "7.94" }, - "9.3": { + "9.4": { "composer": { "version": "2" }, @@ -47,9 +48,9 @@ "fpm-alpine3.17", "fpm-alpine3.16" ], - "version": "9.3.22" + "version": "9.4.9" }, - "9.4": { + "9.5": { "composer": { "version": "2" }, @@ -65,6 +66,6 @@ "fpm-alpine3.17", "fpm-alpine3.16" ], - "version": "9.4.9" + "version": "9.5.0" } } diff --git a/versions.sh b/versions.sh index 003f785e7..17bfc1c2c 100755 --- a/versions.sh +++ b/versions.sh @@ -104,7 +104,7 @@ for version in "${versions[@]}"; do else # https://www.drupal.org/node/3264830 # Require PHP 8.1 for Drupal 10 - [ "8.1" ] + [ "8.2", "8.1" ] end ), } + $doc