diff --git a/10.3/php8.2/apache-bookworm/Dockerfile b/10.3/php8.2/apache-bookworm/Dockerfile deleted file mode 100644 index d1252f318..000000000 --- a/10.3/php8.2/apache-bookworm/Dockerfile +++ /dev/null @@ -1,93 +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/ - -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 - -# 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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.3/php8.2/apache-bullseye/Dockerfile b/10.3/php8.2/apache-bullseye/Dockerfile deleted file mode 100644 index ed4daa452..000000000 --- a/10.3/php8.2/apache-bullseye/Dockerfile +++ /dev/null @@ -1,93 +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/ - -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 - -# 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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.3/php8.2/fpm-alpine3.20/Dockerfile b/10.3/php8.2/fpm-alpine3.20/Dockerfile deleted file mode 100644 index 97a9aa044..000000000 --- a/10.3/php8.2/fpm-alpine3.20/Dockerfile +++ /dev/null @@ -1,82 +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/ - -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 - -# 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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.3/php8.2/fpm-alpine3.21/Dockerfile b/10.3/php8.2/fpm-alpine3.21/Dockerfile deleted file mode 100644 index db0684791..000000000 --- a/10.3/php8.2/fpm-alpine3.21/Dockerfile +++ /dev/null @@ -1,82 +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.21 - -# 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/ - -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 - -# 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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.3/php8.2/fpm-bookworm/Dockerfile b/10.3/php8.2/fpm-bookworm/Dockerfile deleted file mode 100644 index dfa7678aa..000000000 --- a/10.3/php8.2/fpm-bookworm/Dockerfile +++ /dev/null @@ -1,93 +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/ - -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 - -# 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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.3/php8.2/fpm-bullseye/Dockerfile b/10.3/php8.2/fpm-bullseye/Dockerfile deleted file mode 100644 index ef791dc01..000000000 --- a/10.3/php8.2/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,93 +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/ - -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 - -# 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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.5-rc/php8.3/apache-bookworm/Dockerfile b/10.5-rc/php8.3/apache-bookworm/Dockerfile deleted file mode 100644 index 6603ee433..000000000 --- a/10.5-rc/php8.3/apache-bookworm/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.5-rc/php8.3/apache-bullseye/Dockerfile b/10.5-rc/php8.3/apache-bullseye/Dockerfile deleted file mode 100644 index 40eba8032..000000000 --- a/10.5-rc/php8.3/apache-bullseye/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.5-rc/php8.3/fpm-alpine3.20/Dockerfile b/10.5-rc/php8.3/fpm-alpine3.20/Dockerfile deleted file mode 100644 index 70a0768aa..000000000 --- a/10.5-rc/php8.3/fpm-alpine3.20/Dockerfile +++ /dev/null @@ -1,82 +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.3-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/ - -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.5-rc/php8.3/fpm-alpine3.21/Dockerfile b/10.5-rc/php8.3/fpm-alpine3.21/Dockerfile deleted file mode 100644 index a191d9cab..000000000 --- a/10.5-rc/php8.3/fpm-alpine3.21/Dockerfile +++ /dev/null @@ -1,82 +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.3-fpm-alpine3.21 - -# 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/ - -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.5-rc/php8.3/fpm-bookworm/Dockerfile b/10.5-rc/php8.3/fpm-bookworm/Dockerfile deleted file mode 100644 index fc9b5c108..000000000 --- a/10.5-rc/php8.3/fpm-bookworm/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.5-rc/php8.3/fpm-bullseye/Dockerfile b/10.5-rc/php8.3/fpm-bullseye/Dockerfile deleted file mode 100644 index 94951a49a..000000000 --- a/10.5-rc/php8.3/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/10.3/php8.3/apache-bookworm/Dockerfile b/10.5/php8.3/apache-bookworm/Dockerfile similarity index 96% rename from 10.3/php8.3/apache-bookworm/Dockerfile rename to 10.5/php8.3/apache-bookworm/Dockerfile index 2cffc098b..b708d7bf8 100644 --- a/10.3/php8.3/apache-bookworm/Dockerfile +++ b/10.5/php8.3/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.3/php8.3/apache-bullseye/Dockerfile b/10.5/php8.3/apache-bullseye/Dockerfile similarity index 96% rename from 10.3/php8.3/apache-bullseye/Dockerfile rename to 10.5/php8.3/apache-bullseye/Dockerfile index 25ffd5764..4560bba4f 100644 --- a/10.3/php8.3/apache-bullseye/Dockerfile +++ b/10.5/php8.3/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.3/php8.3/fpm-alpine3.20/Dockerfile b/10.5/php8.3/fpm-alpine3.20/Dockerfile similarity index 96% rename from 10.3/php8.3/fpm-alpine3.20/Dockerfile rename to 10.5/php8.3/fpm-alpine3.20/Dockerfile index 576bc8bb5..26d0c7fcc 100644 --- a/10.3/php8.3/fpm-alpine3.20/Dockerfile +++ b/10.5/php8.3/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.3/php8.3/fpm-alpine3.21/Dockerfile b/10.5/php8.3/fpm-alpine3.21/Dockerfile similarity index 96% rename from 10.3/php8.3/fpm-alpine3.21/Dockerfile rename to 10.5/php8.3/fpm-alpine3.21/Dockerfile index 0396a5bc3..1d1b922ed 100644 --- a/10.3/php8.3/fpm-alpine3.21/Dockerfile +++ b/10.5/php8.3/fpm-alpine3.21/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.3/php8.3/fpm-bookworm/Dockerfile b/10.5/php8.3/fpm-bookworm/Dockerfile similarity index 96% rename from 10.3/php8.3/fpm-bookworm/Dockerfile rename to 10.5/php8.3/fpm-bookworm/Dockerfile index 6ee2eb553..5df1eee48 100644 --- a/10.3/php8.3/fpm-bookworm/Dockerfile +++ b/10.5/php8.3/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.3/php8.3/fpm-bullseye/Dockerfile b/10.5/php8.3/fpm-bullseye/Dockerfile similarity index 96% rename from 10.3/php8.3/fpm-bullseye/Dockerfile rename to 10.5/php8.3/fpm-bullseye/Dockerfile index 5a90a5bb3..d27f1c6d7 100644 --- a/10.3/php8.3/fpm-bullseye/Dockerfile +++ b/10.5/php8.3/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/10.3.14 -ENV DRUPAL_VERSION 10.3.14 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.5-rc/php8.4/apache-bookworm/Dockerfile b/10.5/php8.4/apache-bookworm/Dockerfile similarity index 96% rename from 10.5-rc/php8.4/apache-bookworm/Dockerfile rename to 10.5/php8.4/apache-bookworm/Dockerfile index f823be0f4..5eb05167d 100644 --- a/10.5-rc/php8.4/apache-bookworm/Dockerfile +++ b/10.5/php8.4/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.5-rc/php8.4/apache-bullseye/Dockerfile b/10.5/php8.4/apache-bullseye/Dockerfile similarity index 96% rename from 10.5-rc/php8.4/apache-bullseye/Dockerfile rename to 10.5/php8.4/apache-bullseye/Dockerfile index 973075761..8e5ff28d6 100644 --- a/10.5-rc/php8.4/apache-bullseye/Dockerfile +++ b/10.5/php8.4/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.5-rc/php8.4/fpm-alpine3.20/Dockerfile b/10.5/php8.4/fpm-alpine3.20/Dockerfile similarity index 95% rename from 10.5-rc/php8.4/fpm-alpine3.20/Dockerfile rename to 10.5/php8.4/fpm-alpine3.20/Dockerfile index aaee5ea37..355391a81 100644 --- a/10.5-rc/php8.4/fpm-alpine3.20/Dockerfile +++ b/10.5/php8.4/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.5-rc/php8.4/fpm-alpine3.21/Dockerfile b/10.5/php8.4/fpm-alpine3.21/Dockerfile similarity index 95% rename from 10.5-rc/php8.4/fpm-alpine3.21/Dockerfile rename to 10.5/php8.4/fpm-alpine3.21/Dockerfile index 588a957fa..6bdc27ea6 100644 --- a/10.5-rc/php8.4/fpm-alpine3.21/Dockerfile +++ b/10.5/php8.4/fpm-alpine3.21/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.5-rc/php8.4/fpm-bookworm/Dockerfile b/10.5/php8.4/fpm-bookworm/Dockerfile similarity index 96% rename from 10.5-rc/php8.4/fpm-bookworm/Dockerfile rename to 10.5/php8.4/fpm-bookworm/Dockerfile index e4d22bac9..537608111 100644 --- a/10.5-rc/php8.4/fpm-bookworm/Dockerfile +++ b/10.5/php8.4/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/10.5-rc/php8.4/fpm-bullseye/Dockerfile b/10.5/php8.4/fpm-bullseye/Dockerfile similarity index 96% rename from 10.5-rc/php8.4/fpm-bullseye/Dockerfile rename to 10.5/php8.4/fpm-bullseye/Dockerfile index 886467876..49adfbd76 100644 --- a/10.5-rc/php8.4/fpm-bullseye/Dockerfile +++ b/10.5/php8.4/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-25: https://www.drupal.org/project/drupal/releases/10.5.0-beta1 -ENV DRUPAL_VERSION 10.5.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/10.5.0 +ENV DRUPAL_VERSION 10.5.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.3/apache-bookworm/Dockerfile b/11.2-rc/php8.3/apache-bookworm/Dockerfile deleted file mode 100644 index 68adef857..000000000 --- a/11.2-rc/php8.3/apache-bookworm/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/11.2-rc/php8.3/apache-bullseye/Dockerfile b/11.2-rc/php8.3/apache-bullseye/Dockerfile deleted file mode 100644 index 1c7e3ed0d..000000000 --- a/11.2-rc/php8.3/apache-bullseye/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/11.2-rc/php8.3/fpm-alpine3.20/Dockerfile b/11.2-rc/php8.3/fpm-alpine3.20/Dockerfile deleted file mode 100644 index 2454e71dd..000000000 --- a/11.2-rc/php8.3/fpm-alpine3.20/Dockerfile +++ /dev/null @@ -1,82 +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.3-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/ - -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/11.2-rc/php8.3/fpm-alpine3.21/Dockerfile b/11.2-rc/php8.3/fpm-alpine3.21/Dockerfile deleted file mode 100644 index c50eeffe5..000000000 --- a/11.2-rc/php8.3/fpm-alpine3.21/Dockerfile +++ /dev/null @@ -1,82 +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.3-fpm-alpine3.21 - -# 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/ - -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/11.2-rc/php8.3/fpm-bookworm/Dockerfile b/11.2-rc/php8.3/fpm-bookworm/Dockerfile deleted file mode 100644 index 5666e752b..000000000 --- a/11.2-rc/php8.3/fpm-bookworm/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/11.2-rc/php8.3/fpm-bullseye/Dockerfile b/11.2-rc/php8.3/fpm-bullseye/Dockerfile deleted file mode 100644 index b2f0ac221..000000000 --- a/11.2-rc/php8.3/fpm-bullseye/Dockerfile +++ /dev/null @@ -1,93 +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.3-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/ - -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.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" ./; \ -# 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; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/11.0/php8.3/apache-bookworm/Dockerfile b/11.2/php8.3/apache-bookworm/Dockerfile similarity index 96% rename from 11.0/php8.3/apache-bookworm/Dockerfile rename to 11.2/php8.3/apache-bookworm/Dockerfile index 42070e4b4..34083c7e4 100644 --- a/11.0/php8.3/apache-bookworm/Dockerfile +++ b/11.2/php8.3/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/11.0.13 -ENV DRUPAL_VERSION 11.0.13 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.0/php8.3/apache-bullseye/Dockerfile b/11.2/php8.3/apache-bullseye/Dockerfile similarity index 96% rename from 11.0/php8.3/apache-bullseye/Dockerfile rename to 11.2/php8.3/apache-bullseye/Dockerfile index 601b9eae7..9d887fb4d 100644 --- a/11.0/php8.3/apache-bullseye/Dockerfile +++ b/11.2/php8.3/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/11.0.13 -ENV DRUPAL_VERSION 11.0.13 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.0/php8.3/fpm-alpine3.20/Dockerfile b/11.2/php8.3/fpm-alpine3.20/Dockerfile similarity index 96% rename from 11.0/php8.3/fpm-alpine3.20/Dockerfile rename to 11.2/php8.3/fpm-alpine3.20/Dockerfile index 90dd42358..7528032d7 100644 --- a/11.0/php8.3/fpm-alpine3.20/Dockerfile +++ b/11.2/php8.3/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/11.0.13 -ENV DRUPAL_VERSION 11.0.13 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.0/php8.3/fpm-alpine3.21/Dockerfile b/11.2/php8.3/fpm-alpine3.21/Dockerfile similarity index 96% rename from 11.0/php8.3/fpm-alpine3.21/Dockerfile rename to 11.2/php8.3/fpm-alpine3.21/Dockerfile index 87bcffa89..959029ad9 100644 --- a/11.0/php8.3/fpm-alpine3.21/Dockerfile +++ b/11.2/php8.3/fpm-alpine3.21/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/11.0.13 -ENV DRUPAL_VERSION 11.0.13 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.0/php8.3/fpm-bookworm/Dockerfile b/11.2/php8.3/fpm-bookworm/Dockerfile similarity index 96% rename from 11.0/php8.3/fpm-bookworm/Dockerfile rename to 11.2/php8.3/fpm-bookworm/Dockerfile index 525262370..963f5f0e7 100644 --- a/11.0/php8.3/fpm-bookworm/Dockerfile +++ b/11.2/php8.3/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/11.0.13 -ENV DRUPAL_VERSION 11.0.13 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.0/php8.3/fpm-bullseye/Dockerfile b/11.2/php8.3/fpm-bullseye/Dockerfile similarity index 96% rename from 11.0/php8.3/fpm-bullseye/Dockerfile rename to 11.2/php8.3/fpm-bullseye/Dockerfile index 970be5d42..e14f06ad3 100644 --- a/11.0/php8.3/fpm-bullseye/Dockerfile +++ b/11.2/php8.3/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-03-19: https://www.drupal.org/project/drupal/releases/11.0.13 -ENV DRUPAL_VERSION 11.0.13 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.4/apache-bookworm/Dockerfile b/11.2/php8.4/apache-bookworm/Dockerfile similarity index 96% rename from 11.2-rc/php8.4/apache-bookworm/Dockerfile rename to 11.2/php8.4/apache-bookworm/Dockerfile index 9e28d9211..4f9b42255 100644 --- a/11.2-rc/php8.4/apache-bookworm/Dockerfile +++ b/11.2/php8.4/apache-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.4/apache-bullseye/Dockerfile b/11.2/php8.4/apache-bullseye/Dockerfile similarity index 96% rename from 11.2-rc/php8.4/apache-bullseye/Dockerfile rename to 11.2/php8.4/apache-bullseye/Dockerfile index 94a20bea0..65a6f09d8 100644 --- a/11.2-rc/php8.4/apache-bullseye/Dockerfile +++ b/11.2/php8.4/apache-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.4/fpm-alpine3.20/Dockerfile b/11.2/php8.4/fpm-alpine3.20/Dockerfile similarity index 95% rename from 11.2-rc/php8.4/fpm-alpine3.20/Dockerfile rename to 11.2/php8.4/fpm-alpine3.20/Dockerfile index 9a8be5064..d0a67928d 100644 --- a/11.2-rc/php8.4/fpm-alpine3.20/Dockerfile +++ b/11.2/php8.4/fpm-alpine3.20/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.4/fpm-alpine3.21/Dockerfile b/11.2/php8.4/fpm-alpine3.21/Dockerfile similarity index 95% rename from 11.2-rc/php8.4/fpm-alpine3.21/Dockerfile rename to 11.2/php8.4/fpm-alpine3.21/Dockerfile index e25a708a7..af040ca54 100644 --- a/11.2-rc/php8.4/fpm-alpine3.21/Dockerfile +++ b/11.2/php8.4/fpm-alpine3.21/Dockerfile @@ -55,8 +55,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.4/fpm-bookworm/Dockerfile b/11.2/php8.4/fpm-bookworm/Dockerfile similarity index 96% rename from 11.2-rc/php8.4/fpm-bookworm/Dockerfile rename to 11.2/php8.4/fpm-bookworm/Dockerfile index 77f17492c..2186fab52 100644 --- a/11.2-rc/php8.4/fpm-bookworm/Dockerfile +++ b/11.2/php8.4/fpm-bookworm/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/11.2-rc/php8.4/fpm-bullseye/Dockerfile b/11.2/php8.4/fpm-bullseye/Dockerfile similarity index 96% rename from 11.2-rc/php8.4/fpm-bullseye/Dockerfile rename to 11.2/php8.4/fpm-bullseye/Dockerfile index d69a800f0..24028c75a 100644 --- a/11.2-rc/php8.4/fpm-bullseye/Dockerfile +++ b/11.2/php8.4/fpm-bullseye/Dockerfile @@ -66,8 +66,8 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ -# 2025-05-23: https://www.drupal.org/project/drupal/releases/11.2.0-beta1 -ENV DRUPAL_VERSION 11.2.0-beta1 +# 2025-06-19: https://www.drupal.org/project/drupal/releases/11.2.0 +ENV DRUPAL_VERSION 11.2.0 # https://github.com/docker-library/drupal/pull/259 # https://github.com/moby/buildkit/issues/4503 diff --git a/versions.json b/versions.json index 452268009..202ede7de 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { - "11.2-rc": { - "version": "11.2.0-beta1", - "url": "https://ftp.drupal.org/files/projects/drupal-11.2.0-beta1.tar.gz", - "md5": "e3274a061b21477602694d78457fc600", - "date": 1748016040, - "notes": "https://www.drupal.org/project/drupal/releases/11.2.0-beta1", + "11.2": { + "version": "11.2.0", + "url": "https://ftp.drupal.org/files/projects/drupal-11.2.0.tar.gz", + "md5": "916ddf7ba8b72a5e931a2c6c0efff2fd", + "date": 1750294755, + "notes": "https://www.drupal.org/project/drupal/releases/11.2.0", "phpVersions": [ "8.4", "8.3" @@ -21,7 +21,6 @@ "version": "2" } }, - "11.2": null, "11.1": { "version": "11.1.8", "url": "https://ftp.drupal.org/files/projects/drupal-11.1.8.tar.gz", @@ -44,33 +43,12 @@ "version": "2" } }, - "11.0": { - "version": "11.0.13", - "url": "https://ftp.drupal.org/files/projects/drupal-11.0.13.tar.gz", - "md5": "9800603f7abeb684189ac4ec17d79a3e", - "date": 1742408477, - "notes": "https://www.drupal.org/project/drupal/releases/11.0.13", - "phpVersions": [ - "8.3" - ], - "variants": [ - "apache-bookworm", - "fpm-bookworm", - "apache-bullseye", - "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" - ], - "composer": { - "version": "2" - } - }, - "10.5-rc": { - "version": "10.5.0-beta1", - "url": "https://ftp.drupal.org/files/projects/drupal-10.5.0-beta1.tar.gz", - "md5": "f7d682d31e503a3f9161bc97616d4347", - "date": 1748162570, - "notes": "https://www.drupal.org/project/drupal/releases/10.5.0-beta1", + "10.5": { + "version": "10.5.0", + "url": "https://ftp.drupal.org/files/projects/drupal-10.5.0.tar.gz", + "md5": "737e6b23ebfb655b17d8f68b9d6cd028", + "date": 1750294139, + "notes": "https://www.drupal.org/project/drupal/releases/10.5.0", "phpVersions": [ "8.4", "8.3" @@ -87,7 +65,6 @@ "version": "2" } }, - "10.5": null, "10.4": { "version": "10.4.8", "url": "https://ftp.drupal.org/files/projects/drupal-10.4.8.tar.gz", @@ -109,27 +86,5 @@ "composer": { "version": "2" } - }, - "10.3": { - "version": "10.3.14", - "url": "https://ftp.drupal.org/files/projects/drupal-10.3.14.tar.gz", - "md5": "0511f20f69caa44181fadbe23bc4d03f", - "date": 1742410042, - "notes": "https://www.drupal.org/project/drupal/releases/10.3.14", - "phpVersions": [ - "8.3", - "8.2" - ], - "variants": [ - "apache-bookworm", - "fpm-bookworm", - "apache-bullseye", - "fpm-bullseye", - "fpm-alpine3.21", - "fpm-alpine3.20" - ], - "composer": { - "version": "2" - } } }