From c355e4c2f5128485dd3022514fa44ea542b9a89d Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Thu, 6 Jul 2023 12:15:40 -0700 Subject: [PATCH] Add 10.1.x, drop eol 9.4.x --- .../php8.1/apache-bookworm/Dockerfile | 2 +- .../php8.1/apache-bullseye/Dockerfile | 2 +- .../php8.1/fpm-alpine3.17/Dockerfile | 2 +- .../php8.1/fpm-alpine3.18/Dockerfile | 2 +- {9.4 => 10.1}/php8.1/fpm-bookworm/Dockerfile | 2 +- {9.4 => 10.1}/php8.1/fpm-bullseye/Dockerfile | 2 +- .../php8.2/apache-bookworm/Dockerfile | 2 +- .../php8.2/apache-bullseye/Dockerfile | 2 +- .../php8.2/fpm-alpine3.17/Dockerfile | 2 +- .../php8.2/fpm-alpine3.18/Dockerfile | 2 +- {9.4 => 10.1}/php8.2/fpm-bookworm/Dockerfile | 2 +- {9.4 => 10.1}/php8.2/fpm-bullseye/Dockerfile | 2 +- 9.4/php8.0/apache-bullseye/Dockerfile | 83 ------------------- 9.4/php8.0/apache-buster/Dockerfile | 83 ------------------- 9.4/php8.0/fpm-alpine3.16/Dockerfile | 73 ---------------- 9.4/php8.0/fpm-bullseye/Dockerfile | 83 ------------------- 9.4/php8.0/fpm-buster/Dockerfile | 83 ------------------- generate-stackbrew-library.sh | 5 +- versions.json | 24 +++--- 19 files changed, 24 insertions(+), 434 deletions(-) rename {9.4 => 10.1}/php8.1/apache-bookworm/Dockerfile (98%) rename {9.4 => 10.1}/php8.1/apache-bullseye/Dockerfile (98%) rename {9.4 => 10.1}/php8.1/fpm-alpine3.17/Dockerfile (98%) rename {9.4 => 10.1}/php8.1/fpm-alpine3.18/Dockerfile (98%) rename {9.4 => 10.1}/php8.1/fpm-bookworm/Dockerfile (98%) rename {9.4 => 10.1}/php8.1/fpm-bullseye/Dockerfile (98%) rename {9.4 => 10.1}/php8.2/apache-bookworm/Dockerfile (98%) rename {9.4 => 10.1}/php8.2/apache-bullseye/Dockerfile (98%) rename {9.4 => 10.1}/php8.2/fpm-alpine3.17/Dockerfile (98%) rename {9.4 => 10.1}/php8.2/fpm-alpine3.18/Dockerfile (98%) rename {9.4 => 10.1}/php8.2/fpm-bookworm/Dockerfile (98%) rename {9.4 => 10.1}/php8.2/fpm-bullseye/Dockerfile (98%) delete mode 100644 9.4/php8.0/apache-bullseye/Dockerfile delete mode 100644 9.4/php8.0/apache-buster/Dockerfile delete mode 100644 9.4/php8.0/fpm-alpine3.16/Dockerfile delete mode 100644 9.4/php8.0/fpm-bullseye/Dockerfile delete mode 100644 9.4/php8.0/fpm-buster/Dockerfile diff --git a/9.4/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile similarity index 98% rename from 9.4/php8.1/apache-bookworm/Dockerfile rename to 10.1/php8.1/apache-bookworm/Dockerfile index d809ae046..df38c712f 100644 --- a/9.4/php8.1/apache-bookworm/Dockerfile +++ b/10.1/php8.1/apache-bookworm/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile similarity index 98% rename from 9.4/php8.1/apache-bullseye/Dockerfile rename to 10.1/php8.1/apache-bullseye/Dockerfile index fb87b96dd..dfdd61f6a 100644 --- a/9.4/php8.1/apache-bullseye/Dockerfile +++ b/10.1/php8.1/apache-bullseye/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.1/fpm-alpine3.17/Dockerfile b/10.1/php8.1/fpm-alpine3.17/Dockerfile similarity index 98% rename from 9.4/php8.1/fpm-alpine3.17/Dockerfile rename to 10.1/php8.1/fpm-alpine3.17/Dockerfile index 0e8b875db..0329b0890 100644 --- a/9.4/php8.1/fpm-alpine3.17/Dockerfile +++ b/10.1/php8.1/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.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.1/fpm-alpine3.18/Dockerfile b/10.1/php8.1/fpm-alpine3.18/Dockerfile similarity index 98% rename from 9.4/php8.1/fpm-alpine3.18/Dockerfile rename to 10.1/php8.1/fpm-alpine3.18/Dockerfile index 0dbda34b8..f4813fc4a 100644 --- a/9.4/php8.1/fpm-alpine3.18/Dockerfile +++ b/10.1/php8.1/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.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile similarity index 98% rename from 9.4/php8.1/fpm-bookworm/Dockerfile rename to 10.1/php8.1/fpm-bookworm/Dockerfile index 165e40e1d..dea1e54f8 100644 --- a/9.4/php8.1/fpm-bookworm/Dockerfile +++ b/10.1/php8.1/fpm-bookworm/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile similarity index 98% rename from 9.4/php8.1/fpm-bullseye/Dockerfile rename to 10.1/php8.1/fpm-bullseye/Dockerfile index 0dc038af0..541a5399e 100644 --- a/9.4/php8.1/fpm-bullseye/Dockerfile +++ b/10.1/php8.1/fpm-bullseye/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile similarity index 98% rename from 9.4/php8.2/apache-bookworm/Dockerfile rename to 10.1/php8.2/apache-bookworm/Dockerfile index 91b9f9b3f..984047af5 100644 --- a/9.4/php8.2/apache-bookworm/Dockerfile +++ b/10.1/php8.2/apache-bookworm/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile similarity index 98% rename from 9.4/php8.2/apache-bullseye/Dockerfile rename to 10.1/php8.2/apache-bullseye/Dockerfile index f1830cf68..6d0c71526 100644 --- a/9.4/php8.2/apache-bullseye/Dockerfile +++ b/10.1/php8.2/apache-bullseye/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.2/fpm-alpine3.17/Dockerfile b/10.1/php8.2/fpm-alpine3.17/Dockerfile similarity index 98% rename from 9.4/php8.2/fpm-alpine3.17/Dockerfile rename to 10.1/php8.2/fpm-alpine3.17/Dockerfile index 63410a1ad..435179e54 100644 --- a/9.4/php8.2/fpm-alpine3.17/Dockerfile +++ b/10.1/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.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.2/fpm-alpine3.18/Dockerfile b/10.1/php8.2/fpm-alpine3.18/Dockerfile similarity index 98% rename from 9.4/php8.2/fpm-alpine3.18/Dockerfile rename to 10.1/php8.2/fpm-alpine3.18/Dockerfile index d33c2cac1..2039f4b34 100644 --- a/9.4/php8.2/fpm-alpine3.18/Dockerfile +++ b/10.1/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.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile similarity index 98% rename from 9.4/php8.2/fpm-bookworm/Dockerfile rename to 10.1/php8.2/fpm-bookworm/Dockerfile index 4aaf9498a..3073afcd8 100644 --- a/9.4/php8.2/fpm-bookworm/Dockerfile +++ b/10.1/php8.2/fpm-bookworm/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile similarity index 98% rename from 9.4/php8.2/fpm-bullseye/Dockerfile rename to 10.1/php8.2/fpm-bullseye/Dockerfile index f8bad54a0..a86c1f6bf 100644 --- a/9.4/php8.2/fpm-bullseye/Dockerfile +++ b/10.1/php8.2/fpm-bullseye/Dockerfile @@ -66,7 +66,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.4.15 +ENV DRUPAL_VERSION 10.1.1 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.4/php8.0/apache-bullseye/Dockerfile b/9.4/php8.0/apache-bullseye/Dockerfile deleted file mode 100644 index 72db39cd1..000000000 --- a/9.4/php8.0/apache-bullseye/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -# -# 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.0-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 '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | 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'; \ - } > /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 9.4.15 - -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.4/php8.0/apache-buster/Dockerfile b/9.4/php8.0/apache-buster/Dockerfile deleted file mode 100644 index 43e54ebde..000000000 --- a/9.4/php8.0/apache-buster/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -# -# 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.0-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 '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | 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'; \ - } > /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 9.4.15 - -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.4/php8.0/fpm-alpine3.16/Dockerfile b/9.4/php8.0/fpm-alpine3.16/Dockerfile deleted file mode 100644 index 496b234e9..000000000 --- a/9.4/php8.0/fpm-alpine3.16/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -# -# 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.0-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'; \ - } > /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 9.4.15 - -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.4/php8.0/fpm-bullseye/Dockerfile b/9.4/php8.0/fpm-bullseye/Dockerfile deleted file mode 100644 index 02381560e..000000000 --- a/9.4/php8.0/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -# -# 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.0-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 '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | 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'; \ - } > /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 9.4.15 - -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.4/php8.0/fpm-buster/Dockerfile b/9.4/php8.0/fpm-buster/Dockerfile deleted file mode 100644 index ebcc1ec14..000000000 --- a/9.4/php8.0/fpm-buster/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -# -# 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.0-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 '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | 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'; \ - } > /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 9.4.15 - -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/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 3d5ffc2ff..5eda04544 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,8 +3,8 @@ set -Eeuo pipefail declare -A aliases=( [9.5]='9' - [10.0]='10 latest' - [10.1-rc]='rc' + [10.1]='10 latest' + [10.2-rc]='rc' ) defaultDebianSuite='bookworm' @@ -17,7 +17,6 @@ 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.4]='php8.1' [9.5]='php8.1' ) diff --git a/versions.json b/versions.json index 172f15806..d73a3af1c 100644 --- a/versions.json +++ b/versions.json @@ -17,30 +17,26 @@ ], "version": "10.0.10" }, - "7": { - "md5": "4139f0feecb44a53645242194809b73a", + "10.1": { + "composer": { + "version": "2" + }, "phpVersions": [ "8.2", - "8.1", - "8.0" + "8.1" ], "variants": [ "apache-bookworm", "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "apache-buster", - "fpm-buster", "fpm-alpine3.18", - "fpm-alpine3.17", - "fpm-alpine3.16" + "fpm-alpine3.17" ], - "version": "7.98" + "version": "10.1.1" }, - "9.4": { - "composer": { - "version": "2" - }, + "7": { + "md5": "4139f0feecb44a53645242194809b73a", "phpVersions": [ "8.2", "8.1", @@ -57,7 +53,7 @@ "fpm-alpine3.17", "fpm-alpine3.16" ], - "version": "9.4.15" + "version": "7.98" }, "9.5": { "composer": {