diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.21/Dockerfile similarity index 98% rename from 10.2/php8.2/fpm-alpine3.19/Dockerfile rename to 10.2/php8.2/fpm-alpine3.21/Dockerfile index 8b80b5cf..1139e961 100644 --- a/10.2/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.2/php8.2/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.19 +FROM php:8.2-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.2/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.21/Dockerfile similarity index 98% rename from 10.2/php8.3/fpm-alpine3.19/Dockerfile rename to 10.2/php8.3/fpm-alpine3.21/Dockerfile index 41a9a95e..e614ef2a 100644 --- a/10.2/php8.3/fpm-alpine3.19/Dockerfile +++ b/10.2/php8.3/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.19 +FROM php:8.3-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.3/php8.2/fpm-alpine3.19/Dockerfile b/10.3/php8.2/fpm-alpine3.21/Dockerfile similarity index 98% rename from 10.3/php8.2/fpm-alpine3.19/Dockerfile rename to 10.3/php8.2/fpm-alpine3.21/Dockerfile index 566557f1..99546b07 100644 --- a/10.3/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.3/php8.2/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.19 +FROM php:8.2-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.3/php8.3/fpm-alpine3.19/Dockerfile b/10.3/php8.3/fpm-alpine3.21/Dockerfile similarity index 98% rename from 10.3/php8.3/fpm-alpine3.19/Dockerfile rename to 10.3/php8.3/fpm-alpine3.21/Dockerfile index d7ced703..0672323d 100644 --- a/10.3/php8.3/fpm-alpine3.19/Dockerfile +++ b/10.3/php8.3/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.19 +FROM php:8.3-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/10.4-rc/php8.3/apache-bookworm/Dockerfile b/10.4-rc/php8.3/apache-bookworm/Dockerfile new file mode 100644 index 00000000..ea4fe917 --- /dev/null +++ b/10.4-rc/php8.3/apache-bookworm/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/10.4.0-rc1 +ENV DRUPAL_VERSION 10.4.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" ./; \ +# 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.4-rc/php8.3/apache-bullseye/Dockerfile b/10.4-rc/php8.3/apache-bullseye/Dockerfile new file mode 100644 index 00000000..d739099a --- /dev/null +++ b/10.4-rc/php8.3/apache-bullseye/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/10.4.0-rc1 +ENV DRUPAL_VERSION 10.4.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" ./; \ +# 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.4-rc/php8.3/fpm-alpine3.20/Dockerfile b/10.4-rc/php8.3/fpm-alpine3.20/Dockerfile new file mode 100644 index 00000000..28bdb891 --- /dev/null +++ b/10.4-rc/php8.3/fpm-alpine3.20/Dockerfile @@ -0,0 +1,82 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/10.4.0-rc1 +ENV DRUPAL_VERSION 10.4.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" ./; \ +# 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.4-rc/php8.3/fpm-alpine3.21/Dockerfile b/10.4-rc/php8.3/fpm-alpine3.21/Dockerfile new file mode 100644 index 00000000..57fbe4f9 --- /dev/null +++ b/10.4-rc/php8.3/fpm-alpine3.21/Dockerfile @@ -0,0 +1,82 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/10.4.0-rc1 +ENV DRUPAL_VERSION 10.4.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" ./; \ +# 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.4-rc/php8.3/fpm-bookworm/Dockerfile b/10.4-rc/php8.3/fpm-bookworm/Dockerfile new file mode 100644 index 00000000..95d73424 --- /dev/null +++ b/10.4-rc/php8.3/fpm-bookworm/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/10.4.0-rc1 +ENV DRUPAL_VERSION 10.4.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" ./; \ +# 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.4-rc/php8.3/fpm-bullseye/Dockerfile b/10.4-rc/php8.3/fpm-bullseye/Dockerfile new file mode 100644 index 00000000..3ff644af --- /dev/null +++ b/10.4-rc/php8.3/fpm-bullseye/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/10.4.0-rc1 +ENV DRUPAL_VERSION 10.4.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" ./; \ +# 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/fpm-alpine3.19/Dockerfile b/11.0/php8.3/fpm-alpine3.21/Dockerfile similarity index 98% rename from 11.0/php8.3/fpm-alpine3.19/Dockerfile rename to 11.0/php8.3/fpm-alpine3.21/Dockerfile index 9bea8c86..44c39805 100644 --- a/11.0/php8.3/fpm-alpine3.19/Dockerfile +++ b/11.0/php8.3/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.3-fpm-alpine3.19 +FROM php:8.3-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/11.1-rc/php8.3/apache-bookworm/Dockerfile b/11.1-rc/php8.3/apache-bookworm/Dockerfile new file mode 100644 index 00000000..051fcdc0 --- /dev/null +++ b/11.1-rc/php8.3/apache-bookworm/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/11.1.0-rc1 +ENV DRUPAL_VERSION 11.1.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" ./; \ +# 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.1-rc/php8.3/apache-bullseye/Dockerfile b/11.1-rc/php8.3/apache-bullseye/Dockerfile new file mode 100644 index 00000000..e00f99db --- /dev/null +++ b/11.1-rc/php8.3/apache-bullseye/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/11.1.0-rc1 +ENV DRUPAL_VERSION 11.1.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" ./; \ +# 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.1-rc/php8.3/fpm-alpine3.20/Dockerfile b/11.1-rc/php8.3/fpm-alpine3.20/Dockerfile new file mode 100644 index 00000000..5f682a34 --- /dev/null +++ b/11.1-rc/php8.3/fpm-alpine3.20/Dockerfile @@ -0,0 +1,82 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/11.1.0-rc1 +ENV DRUPAL_VERSION 11.1.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" ./; \ +# 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.1-rc/php8.3/fpm-alpine3.21/Dockerfile b/11.1-rc/php8.3/fpm-alpine3.21/Dockerfile new file mode 100644 index 00000000..4f4e90ac --- /dev/null +++ b/11.1-rc/php8.3/fpm-alpine3.21/Dockerfile @@ -0,0 +1,82 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/11.1.0-rc1 +ENV DRUPAL_VERSION 11.1.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" ./; \ +# 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.1-rc/php8.3/fpm-bookworm/Dockerfile b/11.1-rc/php8.3/fpm-bookworm/Dockerfile new file mode 100644 index 00000000..879ca664 --- /dev/null +++ b/11.1-rc/php8.3/fpm-bookworm/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/11.1.0-rc1 +ENV DRUPAL_VERSION 11.1.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" ./; \ +# 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.1-rc/php8.3/fpm-bullseye/Dockerfile b/11.1-rc/php8.3/fpm-bullseye/Dockerfile new file mode 100644 index 00000000..d4897eb4 --- /dev/null +++ b/11.1-rc/php8.3/fpm-bullseye/Dockerfile @@ -0,0 +1,93 @@ +# +# 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/ + +# 2024-12-02: https://www.drupal.org/project/drupal/releases/11.1.0-rc1 +ENV DRUPAL_VERSION 11.1.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" ./; \ +# 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/7/php8.1/fpm-alpine3.19/Dockerfile b/7/php8.1/fpm-alpine3.21/Dockerfile similarity index 98% rename from 7/php8.1/fpm-alpine3.19/Dockerfile rename to 7/php8.1/fpm-alpine3.21/Dockerfile index 76c72be8..87f96946 100644 --- a/7/php8.1/fpm-alpine3.19/Dockerfile +++ b/7/php8.1/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.19 +FROM php:8.1-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/7/php8.2/fpm-alpine3.19/Dockerfile b/7/php8.2/fpm-alpine3.21/Dockerfile similarity index 98% rename from 7/php8.2/fpm-alpine3.19/Dockerfile rename to 7/php8.2/fpm-alpine3.21/Dockerfile index fae5581a..34dd19dc 100644 --- a/7/php8.2/fpm-alpine3.19/Dockerfile +++ b/7/php8.2/fpm-alpine3.21/Dockerfile @@ -5,7 +5,7 @@ # # https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.2-fpm-alpine3.19 +FROM php:8.2-fpm-alpine3.21 # install the PHP extensions we need RUN set -eux; \ diff --git a/versions.json b/versions.json index e856879a..2f88ec2c 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,26 @@ { + "11.1-rc": { + "version": "11.1.0-rc1", + "url": "https://ftp.drupal.org/files/projects/drupal-11.1.0-rc1.tar.gz", + "md5": "32bbb15c13f3da1b8e504040aa311290", + "date": 1733153182, + "notes": "https://www.drupal.org/project/drupal/releases/11.1.0-rc1", + "phpVersions": [ + "8.3" + ], + "variants": [ + "apache-bookworm", + "fpm-bookworm", + "apache-bullseye", + "fpm-bullseye", + "fpm-alpine3.21", + "fpm-alpine3.20" + ], + "composer": { + "version": "2" + } + }, + "11.1": null, "11.0": { "version": "11.0.9", "url": "https://ftp.drupal.org/files/projects/drupal-11.0.9.tar.gz", @@ -13,13 +35,35 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.20", - "fpm-alpine3.19" + "fpm-alpine3.21", + "fpm-alpine3.20" + ], + "composer": { + "version": "2" + } + }, + "10.4-rc": { + "version": "10.4.0-rc1", + "url": "https://ftp.drupal.org/files/projects/drupal-10.4.0-rc1.tar.gz", + "md5": "ac4ca7f79387279e4d1732595ea0c8e3", + "date": 1733155673, + "notes": "https://www.drupal.org/project/drupal/releases/10.4.0-rc1", + "phpVersions": [ + "8.3" + ], + "variants": [ + "apache-bookworm", + "fpm-bookworm", + "apache-bullseye", + "fpm-bullseye", + "fpm-alpine3.21", + "fpm-alpine3.20" ], "composer": { "version": "2" } }, + "10.4": null, "10.3": { "version": "10.3.10", "url": "https://ftp.drupal.org/files/projects/drupal-10.3.10.tar.gz", @@ -35,8 +79,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.20", - "fpm-alpine3.19" + "fpm-alpine3.21", + "fpm-alpine3.20" ], "composer": { "version": "2" @@ -57,8 +101,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.20", - "fpm-alpine3.19" + "fpm-alpine3.21", + "fpm-alpine3.20" ], "composer": { "version": "2" @@ -79,8 +123,8 @@ "fpm-bookworm", "apache-bullseye", "fpm-bullseye", - "fpm-alpine3.20", - "fpm-alpine3.19" + "fpm-alpine3.21", + "fpm-alpine3.20" ] } } diff --git a/versions.sh b/versions.sh index 39967ed5..74fd34f2 100755 --- a/versions.sh +++ b/versions.sh @@ -134,8 +134,8 @@ for version in "${versions[@]}"; do variants: [ "bookworm", "bullseye", + "alpine3.21", "alpine3.20", - "alpine3.19", empty | if startswith("alpine") then empty else "apache-" + .