diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61ffb56e..9e33b8bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: outputs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: docker-library/bashbrew@HEAD - id: generate-jobs name: Generate Jobs @@ -44,7 +44,7 @@ jobs: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare Environment run: ${{ matrix.runs.prepare }} - name: Pull Dependencies diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 14497bec..2e1fb787 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -13,7 +13,7 @@ jobs: name: Check For Uncomitted Changes runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Apply Templates run: ./apply-templates.sh - name: Check Git Status diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile deleted file mode 100644 index 8170958a..00000000 --- a/10.1/php8.1/apache-bookworm/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-apache-bookworm - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile deleted file mode 100644 index 0604d77b..00000000 --- a/10.1/php8.1/apache-bullseye/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-apache-bullseye - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.1/fpm-alpine3.19/Dockerfile b/10.1/php8.1/fpm-alpine3.19/Dockerfile deleted file mode 100644 index 80454fd0..00000000 --- a/10.1/php8.1/fpm-alpine3.19/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.19 - -# 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.1/fpm-alpine3.20/Dockerfile b/10.1/php8.1/fpm-alpine3.20/Dockerfile deleted file mode 100644 index a47ff64d..00000000 --- a/10.1/php8.1/fpm-alpine3.20/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.20 - -# 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile deleted file mode 100644 index 7659c9c0..00000000 --- a/10.1/php8.1/fpm-bookworm/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-bookworm - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile deleted file mode 100644 index 4e23aaf4..00000000 --- a/10.1/php8.1/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-bullseye - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.2/fpm-alpine3.20/Dockerfile b/10.1/php8.2/fpm-alpine3.20/Dockerfile deleted file mode 100644 index 8b507b57..00000000 --- a/10.1/php8.2/fpm-alpine3.20/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.20 - -# 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/ - -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.2/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile index 386c2c1c..420643f9 100644 --- a/10.2/php8.2/apache-bookworm/Dockerfile +++ b/10.2/php8.2/apache-bookworm/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile index 943cf373..88fc845c 100644 --- a/10.2/php8.2/apache-bullseye/Dockerfile +++ b/10.2/php8.2/apache-bullseye/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile index 3db6328e..aae2fb36 100644 --- a/10.2/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.2/php8.2/fpm-alpine3.19/Dockerfile @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.2/fpm-alpine3.20/Dockerfile b/10.2/php8.2/fpm-alpine3.20/Dockerfile index 815972b6..0bec6d8b 100644 --- a/10.2/php8.2/fpm-alpine3.20/Dockerfile +++ b/10.2/php8.2/fpm-alpine3.20/Dockerfile @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile index 65a2503c..0593065d 100644 --- a/10.2/php8.2/fpm-bookworm/Dockerfile +++ b/10.2/php8.2/fpm-bookworm/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.2/fpm-bullseye/Dockerfile b/10.2/php8.2/fpm-bullseye/Dockerfile index 02c07951..24b19527 100644 --- a/10.2/php8.2/fpm-bullseye/Dockerfile +++ b/10.2/php8.2/fpm-bullseye/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.3/apache-bookworm/Dockerfile b/10.2/php8.3/apache-bookworm/Dockerfile index 12736d3c..87699c1d 100644 --- a/10.2/php8.3/apache-bookworm/Dockerfile +++ b/10.2/php8.3/apache-bookworm/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.3/apache-bullseye/Dockerfile b/10.2/php8.3/apache-bullseye/Dockerfile index 7485b79a..5843d286 100644 --- a/10.2/php8.3/apache-bullseye/Dockerfile +++ b/10.2/php8.3/apache-bullseye/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.19/Dockerfile index 390c836e..3f140fe5 100644 --- a/10.2/php8.3/fpm-alpine3.19/Dockerfile +++ b/10.2/php8.3/fpm-alpine3.19/Dockerfile @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.3/fpm-alpine3.20/Dockerfile b/10.2/php8.3/fpm-alpine3.20/Dockerfile index 1f9e4491..3aa74cee 100644 --- a/10.2/php8.3/fpm-alpine3.20/Dockerfile +++ b/10.2/php8.3/fpm-alpine3.20/Dockerfile @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.3/fpm-bookworm/Dockerfile b/10.2/php8.3/fpm-bookworm/Dockerfile index 6ef5db5c..90cf084d 100644 --- a/10.2/php8.3/fpm-bookworm/Dockerfile +++ b/10.2/php8.3/fpm-bookworm/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.2/php8.3/fpm-bullseye/Dockerfile b/10.2/php8.3/fpm-bullseye/Dockerfile index 78f39349..f85b0ad9 100644 --- a/10.2/php8.3/fpm-bullseye/Dockerfile +++ b/10.2/php8.3/fpm-bullseye/Dockerfile @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.2/apache-bookworm/Dockerfile b/10.3-rc/php8.2/apache-bookworm/Dockerfile deleted file mode 100644 index 4d19b05c..00000000 --- a/10.3-rc/php8.2/apache-bookworm/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-apache-bookworm - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.3-rc/php8.2/apache-bullseye/Dockerfile b/10.3-rc/php8.2/apache-bullseye/Dockerfile deleted file mode 100644 index 791ff077..00000000 --- a/10.3-rc/php8.2/apache-bullseye/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# 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 \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.3-rc/php8.2/fpm-alpine3.19/Dockerfile b/10.3-rc/php8.2/fpm-alpine3.19/Dockerfile deleted file mode 100644 index ac1d1e3b..00000000 --- a/10.3-rc/php8.2/fpm-alpine3.19/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.19 - -# 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/ - -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.3-rc/php8.2/fpm-bookworm/Dockerfile b/10.3-rc/php8.2/fpm-bookworm/Dockerfile deleted file mode 100644 index 08587b37..00000000 --- a/10.3-rc/php8.2/fpm-bookworm/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-bookworm - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.3-rc/php8.2/fpm-bullseye/Dockerfile b/10.3-rc/php8.2/fpm-bullseye/Dockerfile deleted file mode 100644 index c4ab0430..00000000 --- a/10.3-rc/php8.2/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# 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 \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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.1/php8.2/apache-bookworm/Dockerfile b/10.3/php8.2/apache-bookworm/Dockerfile similarity index 92% rename from 10.1/php8.2/apache-bookworm/Dockerfile rename to 10.3/php8.2/apache-bookworm/Dockerfile index a7293846..c14592ec 100644 --- a/10.1/php8.2/apache-bookworm/Dockerfile +++ b/10.3/php8.2/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.3/php8.2/apache-bullseye/Dockerfile similarity index 92% rename from 10.1/php8.2/apache-bullseye/Dockerfile rename to 10.3/php8.2/apache-bullseye/Dockerfile index fd8be428..2a9fa2a3 100644 --- a/10.1/php8.2/apache-bullseye/Dockerfile +++ b/10.3/php8.2/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.1/php8.2/fpm-alpine3.19/Dockerfile b/10.3/php8.2/fpm-alpine3.19/Dockerfile similarity index 91% rename from 10.1/php8.2/fpm-alpine3.19/Dockerfile rename to 10.3/php8.2/fpm-alpine3.19/Dockerfile index 18409b9a..e83641f1 100644 --- a/10.1/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.3/php8.2/fpm-alpine3.19/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.2/fpm-alpine3.20/Dockerfile b/10.3/php8.2/fpm-alpine3.20/Dockerfile similarity index 91% rename from 10.3-rc/php8.2/fpm-alpine3.20/Dockerfile rename to 10.3/php8.2/fpm-alpine3.20/Dockerfile index 1a29682a..dd3c2313 100644 --- a/10.3-rc/php8.2/fpm-alpine3.20/Dockerfile +++ b/10.3/php8.2/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.3/php8.2/fpm-bookworm/Dockerfile similarity index 92% rename from 10.1/php8.2/fpm-bookworm/Dockerfile rename to 10.3/php8.2/fpm-bookworm/Dockerfile index 9b9be2ae..93b2f5b4 100644 --- a/10.1/php8.2/fpm-bookworm/Dockerfile +++ b/10.3/php8.2/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.3/php8.2/fpm-bullseye/Dockerfile similarity index 92% rename from 10.1/php8.2/fpm-bullseye/Dockerfile rename to 10.3/php8.2/fpm-bullseye/Dockerfile index b9396be1..f3e436f0 100644 --- a/10.1/php8.2/fpm-bullseye/Dockerfile +++ b/10.3/php8.2/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-01-17: https://www.drupal.org/project/drupal/releases/10.1.8 -ENV DRUPAL_VERSION 10.1.8 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.3/apache-bookworm/Dockerfile b/10.3/php8.3/apache-bookworm/Dockerfile similarity index 92% rename from 10.3-rc/php8.3/apache-bookworm/Dockerfile rename to 10.3/php8.3/apache-bookworm/Dockerfile index 83b4df5c..296133d1 100644 --- a/10.3-rc/php8.3/apache-bookworm/Dockerfile +++ b/10.3/php8.3/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.3/apache-bullseye/Dockerfile b/10.3/php8.3/apache-bullseye/Dockerfile similarity index 92% rename from 10.3-rc/php8.3/apache-bullseye/Dockerfile rename to 10.3/php8.3/apache-bullseye/Dockerfile index ff6b0b9d..d063507a 100644 --- a/10.3-rc/php8.3/apache-bullseye/Dockerfile +++ b/10.3/php8.3/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.3/fpm-alpine3.19/Dockerfile b/10.3/php8.3/fpm-alpine3.19/Dockerfile similarity index 91% rename from 10.3-rc/php8.3/fpm-alpine3.19/Dockerfile rename to 10.3/php8.3/fpm-alpine3.19/Dockerfile index f0c9b494..e88b5a80 100644 --- a/10.3-rc/php8.3/fpm-alpine3.19/Dockerfile +++ b/10.3/php8.3/fpm-alpine3.19/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.3/fpm-alpine3.20/Dockerfile b/10.3/php8.3/fpm-alpine3.20/Dockerfile similarity index 91% rename from 10.3-rc/php8.3/fpm-alpine3.20/Dockerfile rename to 10.3/php8.3/fpm-alpine3.20/Dockerfile index 76a33b67..85c76646 100644 --- a/10.3-rc/php8.3/fpm-alpine3.20/Dockerfile +++ b/10.3/php8.3/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.3/fpm-bookworm/Dockerfile b/10.3/php8.3/fpm-bookworm/Dockerfile similarity index 92% rename from 10.3-rc/php8.3/fpm-bookworm/Dockerfile rename to 10.3/php8.3/fpm-bookworm/Dockerfile index f1d613b0..a56173c0 100644 --- a/10.3-rc/php8.3/fpm-bookworm/Dockerfile +++ b/10.3/php8.3/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/10.3-rc/php8.3/fpm-bullseye/Dockerfile b/10.3/php8.3/fpm-bullseye/Dockerfile similarity index 92% rename from 10.3-rc/php8.3/fpm-bullseye/Dockerfile rename to 10.3/php8.3/fpm-bullseye/Dockerfile index 045f7f57..5cb27dcc 100644 --- a/10.3-rc/php8.3/fpm-bullseye/Dockerfile +++ b/10.3/php8.3/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/10.3.2 +ENV DRUPAL_VERSION 10.3.2 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.0-rc/php8.2/apache-bookworm/Dockerfile b/11.0-rc/php8.2/apache-bookworm/Dockerfile deleted file mode 100644 index 3f4f49d4..00000000 --- a/11.0-rc/php8.2/apache-bookworm/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-apache-bookworm - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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/11.0-rc/php8.2/apache-bullseye/Dockerfile b/11.0-rc/php8.2/apache-bullseye/Dockerfile deleted file mode 100644 index 8b5a9d2d..00000000 --- a/11.0-rc/php8.2/apache-bullseye/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# 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 \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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/11.0-rc/php8.2/fpm-alpine3.19/Dockerfile b/11.0-rc/php8.2/fpm-alpine3.19/Dockerfile deleted file mode 100644 index 9d38affb..00000000 --- a/11.0-rc/php8.2/fpm-alpine3.19/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.19 - -# 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/ - -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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/11.0-rc/php8.2/fpm-alpine3.20/Dockerfile b/11.0-rc/php8.2/fpm-alpine3.20/Dockerfile deleted file mode 100644 index 46a2b157..00000000 --- a/11.0-rc/php8.2/fpm-alpine3.20/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.20 - -# 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/ - -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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/11.0-rc/php8.2/fpm-bookworm/Dockerfile b/11.0-rc/php8.2/fpm-bookworm/Dockerfile deleted file mode 100644 index 8c4e5749..00000000 --- a/11.0-rc/php8.2/fpm-bookworm/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-bookworm - -# install the PHP extensions we need -RUN set -eux; \ - \ - if command -v a2enmod; then \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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/11.0-rc/php8.2/fpm-bullseye/Dockerfile b/11.0-rc/php8.2/fpm-bullseye/Dockerfile deleted file mode 100644 index e887fc83..00000000 --- a/11.0-rc/php8.2/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# 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 \ -# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly) - a2enmod expires 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); printf "*%s\n", 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/ - -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 - -# https://github.com/docker-library/drupal/pull/259 -# https://github.com/moby/buildkit/issues/4503 -# https://github.com/composer/composer/issues/11839 -# https://github.com/composer/composer/issues/11854 -# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218 -ENV COMPOSER_ALLOW_SUPERUSER 1 - -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/11.0-rc/php8.3/apache-bookworm/Dockerfile b/11.0/php8.3/apache-bookworm/Dockerfile similarity index 92% rename from 11.0-rc/php8.3/apache-bookworm/Dockerfile rename to 11.0/php8.3/apache-bookworm/Dockerfile index 804f8e7e..81afad97 100644 --- a/11.0-rc/php8.3/apache-bookworm/Dockerfile +++ b/11.0/php8.3/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/11.0.1 +ENV DRUPAL_VERSION 11.0.1 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.0-rc/php8.3/apache-bullseye/Dockerfile b/11.0/php8.3/apache-bullseye/Dockerfile similarity index 92% rename from 11.0-rc/php8.3/apache-bullseye/Dockerfile rename to 11.0/php8.3/apache-bullseye/Dockerfile index 9df297c1..0e0f5f96 100644 --- a/11.0-rc/php8.3/apache-bullseye/Dockerfile +++ b/11.0/php8.3/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/11.0.1 +ENV DRUPAL_VERSION 11.0.1 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.0-rc/php8.3/fpm-alpine3.19/Dockerfile b/11.0/php8.3/fpm-alpine3.19/Dockerfile similarity index 91% rename from 11.0-rc/php8.3/fpm-alpine3.19/Dockerfile rename to 11.0/php8.3/fpm-alpine3.19/Dockerfile index e3f6d034..549ec05e 100644 --- a/11.0-rc/php8.3/fpm-alpine3.19/Dockerfile +++ b/11.0/php8.3/fpm-alpine3.19/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/11.0.1 +ENV DRUPAL_VERSION 11.0.1 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.0-rc/php8.3/fpm-alpine3.20/Dockerfile b/11.0/php8.3/fpm-alpine3.20/Dockerfile similarity index 91% rename from 11.0-rc/php8.3/fpm-alpine3.20/Dockerfile rename to 11.0/php8.3/fpm-alpine3.20/Dockerfile index 3929497e..00f70e26 100644 --- a/11.0-rc/php8.3/fpm-alpine3.20/Dockerfile +++ b/11.0/php8.3/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/11.0.1 +ENV DRUPAL_VERSION 11.0.1 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -69,6 +69,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.0-rc/php8.3/fpm-bookworm/Dockerfile b/11.0/php8.3/fpm-bookworm/Dockerfile similarity index 92% rename from 11.0-rc/php8.3/fpm-bookworm/Dockerfile rename to 11.0/php8.3/fpm-bookworm/Dockerfile index 5a157adc..359d88fd 100644 --- a/11.0-rc/php8.3/fpm-bookworm/Dockerfile +++ b/11.0/php8.3/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/11.0.1 +ENV DRUPAL_VERSION 11.0.1 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.0-rc/php8.3/fpm-bullseye/Dockerfile b/11.0/php8.3/fpm-bullseye/Dockerfile similarity index 92% rename from 11.0-rc/php8.3/fpm-bullseye/Dockerfile rename to 11.0/php8.3/fpm-bullseye/Dockerfile index 94237776..52f45a7b 100644 --- a/11.0-rc/php8.3/fpm-bullseye/Dockerfile +++ b/11.0/php8.3/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2024-05-17: https://www.drupal.org/project/drupal/releases/11.0.0-beta1 -ENV DRUPAL_VERSION 11.0.0-beta1 +# 2024-08-08: https://www.drupal.org/project/drupal/releases/11.0.1 +ENV DRUPAL_VERSION 11.0.1 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 @@ -80,6 +80,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/Dockerfile.template b/Dockerfile.template index e65a7a1d..8ab3b8f5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -128,6 +128,8 @@ WORKDIR /opt/drupal RUN set -eux; \ export COMPOSER_HOME="$(mktemp -d)"; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ +# https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 + composer check-platform-reqs; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index e4432b6d..164ac2de 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,8 @@ set -Eeuo pipefail declare -A aliases=( - [10.2]='10 latest' - [11.0-rc]='rc' + [11.0]='11 latest' + [10.3]='10' ) defaultDebianSuite='bookworm' @@ -11,8 +11,11 @@ declare -A debianSuites=( #[10.0]='bullseye' ) -defaultPhpVersion='php8.2' +defaultPhpVersion='php8.3' declare -A defaultPhpVersions=( +# releases older than 11 will conservatively stay on 8.2 by default + [10.3]='php8.2' + [10.2]='php8.2' # 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 diff --git a/versions.json b/versions.json index dff0d9b1..3eca9a4f 100644 --- a/versions.json +++ b/versions.json @@ -1,13 +1,13 @@ { - "11.0-rc": { - "version": "11.0.0-beta1", - "url": "https://ftp.drupal.org/files/projects/drupal-11.0.0-beta1.tar.gz", - "md5": "ad403fb5d06c9b8173e1a71e96a159db", - "date": 1715953266, - "notes": "https://www.drupal.org/project/drupal/releases/11.0.0-beta1", + "11.0": { + "civicrmVersion": "5.76.2", + "version": "11.0.1", + "url": "https://ftp.drupal.org/files/projects/drupal-11.0.1.tar.gz", + "md5": "6d257f279f4e99ab4d6732084c33139f", + "date": 1723108396, + "notes": "https://www.drupal.org/project/drupal/releases/11.0.1", "phpVersions": [ - "8.3", - "8.2" + "8.3" ], "variants": [ "apache-bookworm", @@ -21,13 +21,13 @@ "version": "2" } }, - "11.0": null, - "10.3-rc": { - "version": "10.3.0-rc1", - "url": "https://ftp.drupal.org/files/projects/drupal-10.3.0-rc1.tar.gz", - "md5": "adc503e3b8abcccd2878b867f8575d44", - "date": 1717621189, - "notes": "https://www.drupal.org/project/drupal/releases/10.3.0-rc1", + "10.3": { + "civicrmVersion": "5.76.2", + "version": "10.3.2", + "url": "https://ftp.drupal.org/files/projects/drupal-10.3.2.tar.gz", + "md5": "dd37e3aa723db75a04159faed0537eab", + "date": 1723109810, + "notes": "https://www.drupal.org/project/drupal/releases/10.3.2", "phpVersions": [ "8.3", "8.2" @@ -44,9 +44,8 @@ "version": "2" } }, - "10.3": null, "10.2": { - "civicrmVersion": "5.74.4", + "civicrmVersion": "5.76.2", "version": "10.2.7", "url": "https://ftp.drupal.org/files/projects/drupal-10.2.7.tar.gz", "md5": "3a7e953bd925520d853f904466c1479e", @@ -64,7 +63,7 @@ } }, "10.1": { - "civicrmVersion": "5.74.4", + "civicrmVersion": "5.76.2", "version": "10.1.8", "url": "https://ftp.drupal.org/files/projects/drupal-10.1.8.tar.gz", "md5": "2ea6f94091de2760908557dd3bb1956a", @@ -82,7 +81,7 @@ } }, "7": { - "civicrmVersion": "5.74.4", + "civicrmVersion": "5.76.2", "version": "7.101", "url": "https://ftp.drupal.org/files/projects/drupal-7.101.tar.gz", "md5": "ddcd8cb4e885ae865a3d1a8b06707a67", diff --git a/versions.sh b/versions.sh index 15e3568b..1f183437 100755 --- a/versions.sh +++ b/versions.sh @@ -116,9 +116,16 @@ for version in "${versions[@]}"; do [ # 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", - if [ "7", "10.0", "10.1" ] | index(env.version) then "8.1" else empty end, + if [ "7", "10.0" ] | index(env.version) then empty else + "8.3" + end, + # https://www.drupal.org/node/3413288 ("Drupal 11 will require PHP 8.3") + if [ "7", "10.0", "10.2", "10.3" ] | index(env.version) then + "8.2" + else empty end, + if [ "7", "10.0" ] | 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