From 6aecee0150b6216435ca09475eeecfab31c53c1e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 1 Jun 2022 08:14:31 -0700 Subject: [PATCH] Update to 9.3.14, 9.2.20, 7.90, and Alpine 3.16 --- .../Dockerfile | 2 +- 7/php7.4/apache-bullseye/Dockerfile | 4 +- 7/php7.4/apache-buster/Dockerfile | 4 +- 7/php7.4/fpm-alpine3.15/Dockerfile | 4 +- .../Dockerfile | 6 +- 7/php7.4/fpm-bullseye/Dockerfile | 4 +- 7/php7.4/fpm-buster/Dockerfile | 4 +- 9.2/php7.4/apache-bullseye/Dockerfile | 2 +- 9.2/php7.4/apache-buster/Dockerfile | 2 +- 9.2/php7.4/fpm-alpine3.15/Dockerfile | 2 +- .../php7.4/fpm-alpine3.16}/Dockerfile | 4 +- 9.2/php7.4/fpm-bullseye/Dockerfile | 2 +- 9.2/php7.4/fpm-buster/Dockerfile | 2 +- 9.2/php8.0/apache-bullseye/Dockerfile | 2 +- 9.2/php8.0/apache-buster/Dockerfile | 2 +- 9.2/php8.0/fpm-alpine3.15/Dockerfile | 2 +- .../php8.0/fpm-alpine3.16}/Dockerfile | 4 +- 9.2/php8.0/fpm-bullseye/Dockerfile | 2 +- 9.2/php8.0/fpm-buster/Dockerfile | 2 +- 9.3/php7.4/apache-bullseye/Dockerfile | 2 +- 9.3/php7.4/apache-buster/Dockerfile | 2 +- 9.3/php7.4/fpm-alpine3.15/Dockerfile | 2 +- .../php7.4/fpm-alpine3.16}/Dockerfile | 4 +- 9.3/php7.4/fpm-bullseye/Dockerfile | 2 +- 9.3/php7.4/fpm-buster/Dockerfile | 2 +- 9.3/php8.0/apache-bullseye/Dockerfile | 2 +- 9.3/php8.0/apache-buster/Dockerfile | 2 +- 9.3/php8.0/fpm-alpine3.15/Dockerfile | 2 +- .../php8.0/fpm-alpine3.16}/Dockerfile | 4 +- 9.3/php8.0/fpm-bullseye/Dockerfile | 2 +- 9.3/php8.0/fpm-buster/Dockerfile | 2 +- 9.3/php8.1/apache-bullseye/Dockerfile | 2 +- 9.3/php8.1/apache-buster/Dockerfile | 2 +- 9.3/php8.1/fpm-alpine3.14/Dockerfile | 74 ------------------- 9.3/php8.1/fpm-alpine3.15/Dockerfile | 2 +- 9.3/php8.1/fpm-alpine3.16/Dockerfile | 74 +++++++++++++++++++ 9.3/php8.1/fpm-bullseye/Dockerfile | 2 +- 9.3/php8.1/fpm-buster/Dockerfile | 2 +- versions.json | 24 +++--- versions.sh | 4 +- 40 files changed, 135 insertions(+), 135 deletions(-) rename 10.0-rc/php8.1/{fpm-alpine3.14 => fpm-alpine3.16}/Dockerfile (98%) rename 7/php7.4/{fpm-alpine3.14 => fpm-alpine3.16}/Dockerfile (94%) rename {9.3/php8.0/fpm-alpine3.14 => 9.2/php7.4/fpm-alpine3.16}/Dockerfile (97%) rename {9.3/php7.4/fpm-alpine3.14 => 9.2/php8.0/fpm-alpine3.16}/Dockerfile (97%) rename {9.2/php7.4/fpm-alpine3.14 => 9.3/php7.4/fpm-alpine3.16}/Dockerfile (97%) rename {9.2/php8.0/fpm-alpine3.14 => 9.3/php8.0/fpm-alpine3.16}/Dockerfile (97%) delete mode 100644 9.3/php8.1/fpm-alpine3.14/Dockerfile create mode 100644 9.3/php8.1/fpm-alpine3.16/Dockerfile diff --git a/10.0-rc/php8.1/fpm-alpine3.14/Dockerfile b/10.0-rc/php8.1/fpm-alpine3.16/Dockerfile similarity index 98% rename from 10.0-rc/php8.1/fpm-alpine3.14/Dockerfile rename to 10.0-rc/php8.1/fpm-alpine3.16/Dockerfile index eaf3e5e1c..12b10590c 100644 --- a/10.0-rc/php8.1/fpm-alpine3.14/Dockerfile +++ b/10.0-rc/php8.1/fpm-alpine3.16/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.14 +FROM php:8.1-fpm-alpine3.16 # install the PHP extensions we need RUN set -eux; \ diff --git a/7/php7.4/apache-bullseye/Dockerfile b/7/php7.4/apache-bullseye/Dockerfile index 982bed57c..57cc20f4a 100644 --- a/7/php7.4/apache-bullseye/Dockerfile +++ b/7/php7.4/apache-bullseye/Dockerfile @@ -65,8 +65,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 7.89 -ENV DRUPAL_MD5 924e707e3b1e8269fe623cf2f22ee710 +ENV DRUPAL_VERSION 7.90 +ENV DRUPAL_MD5 4cb30e74d1b57ef32d8efcd664e32f54 RUN set -eux; \ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \ diff --git a/7/php7.4/apache-buster/Dockerfile b/7/php7.4/apache-buster/Dockerfile index 14d6efa10..fb277c96f 100644 --- a/7/php7.4/apache-buster/Dockerfile +++ b/7/php7.4/apache-buster/Dockerfile @@ -65,8 +65,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 7.89 -ENV DRUPAL_MD5 924e707e3b1e8269fe623cf2f22ee710 +ENV DRUPAL_VERSION 7.90 +ENV DRUPAL_MD5 4cb30e74d1b57ef32d8efcd664e32f54 RUN set -eux; \ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \ diff --git a/7/php7.4/fpm-alpine3.15/Dockerfile b/7/php7.4/fpm-alpine3.15/Dockerfile index 26994b0e1..0c4212568 100644 --- a/7/php7.4/fpm-alpine3.15/Dockerfile +++ b/7/php7.4/fpm-alpine3.15/Dockerfile @@ -55,8 +55,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 7.89 -ENV DRUPAL_MD5 924e707e3b1e8269fe623cf2f22ee710 +ENV DRUPAL_VERSION 7.90 +ENV DRUPAL_MD5 4cb30e74d1b57ef32d8efcd664e32f54 RUN set -eux; \ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \ diff --git a/7/php7.4/fpm-alpine3.14/Dockerfile b/7/php7.4/fpm-alpine3.16/Dockerfile similarity index 94% rename from 7/php7.4/fpm-alpine3.14/Dockerfile rename to 7/php7.4/fpm-alpine3.16/Dockerfile index 7a6a83b7d..7c4fdca6e 100644 --- a/7/php7.4/fpm-alpine3.14/Dockerfile +++ b/7/php7.4/fpm-alpine3.16/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:7.4-fpm-alpine3.14 +FROM php:7.4-fpm-alpine3.16 # install the PHP extensions we need RUN set -eux; \ @@ -55,8 +55,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 7.89 -ENV DRUPAL_MD5 924e707e3b1e8269fe623cf2f22ee710 +ENV DRUPAL_VERSION 7.90 +ENV DRUPAL_MD5 4cb30e74d1b57ef32d8efcd664e32f54 RUN set -eux; \ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \ diff --git a/7/php7.4/fpm-bullseye/Dockerfile b/7/php7.4/fpm-bullseye/Dockerfile index a14868449..6d271d0cd 100644 --- a/7/php7.4/fpm-bullseye/Dockerfile +++ b/7/php7.4/fpm-bullseye/Dockerfile @@ -65,8 +65,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 7.89 -ENV DRUPAL_MD5 924e707e3b1e8269fe623cf2f22ee710 +ENV DRUPAL_VERSION 7.90 +ENV DRUPAL_MD5 4cb30e74d1b57ef32d8efcd664e32f54 RUN set -eux; \ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \ diff --git a/7/php7.4/fpm-buster/Dockerfile b/7/php7.4/fpm-buster/Dockerfile index f005e3ae4..f717625ec 100644 --- a/7/php7.4/fpm-buster/Dockerfile +++ b/7/php7.4/fpm-buster/Dockerfile @@ -65,8 +65,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 7.89 -ENV DRUPAL_MD5 924e707e3b1e8269fe623cf2f22ee710 +ENV DRUPAL_VERSION 7.90 +ENV DRUPAL_MD5 4cb30e74d1b57ef32d8efcd664e32f54 RUN set -eux; \ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \ diff --git a/9.2/php7.4/apache-bullseye/Dockerfile b/9.2/php7.4/apache-bullseye/Dockerfile index b8fbab9eb..2a79b7d28 100644 --- a/9.2/php7.4/apache-bullseye/Dockerfile +++ b/9.2/php7.4/apache-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php7.4/apache-buster/Dockerfile b/9.2/php7.4/apache-buster/Dockerfile index c639a3f8d..1cde01e9e 100644 --- a/9.2/php7.4/apache-buster/Dockerfile +++ b/9.2/php7.4/apache-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php7.4/fpm-alpine3.15/Dockerfile b/9.2/php7.4/fpm-alpine3.15/Dockerfile index d9fa21613..64cd525ea 100644 --- a/9.2/php7.4/fpm-alpine3.15/Dockerfile +++ b/9.2/php7.4/fpm-alpine3.15/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-alpine3.14/Dockerfile b/9.2/php7.4/fpm-alpine3.16/Dockerfile similarity index 97% rename from 9.3/php8.0/fpm-alpine3.14/Dockerfile rename to 9.2/php7.4/fpm-alpine3.16/Dockerfile index e91d2a063..9647cb163 100644 --- a/9.3/php8.0/fpm-alpine3.14/Dockerfile +++ b/9.2/php7.4/fpm-alpine3.16/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.0-fpm-alpine3.14 +FROM php:7.4-fpm-alpine3.16 # install the PHP extensions we need RUN set -eux; \ @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php7.4/fpm-bullseye/Dockerfile b/9.2/php7.4/fpm-bullseye/Dockerfile index c5ede8fdd..3dc6a03c1 100644 --- a/9.2/php7.4/fpm-bullseye/Dockerfile +++ b/9.2/php7.4/fpm-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php7.4/fpm-buster/Dockerfile b/9.2/php7.4/fpm-buster/Dockerfile index bbee59f49..d7aeb1ed5 100644 --- a/9.2/php7.4/fpm-buster/Dockerfile +++ b/9.2/php7.4/fpm-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php8.0/apache-bullseye/Dockerfile b/9.2/php8.0/apache-bullseye/Dockerfile index d5a8f6c14..8563f26eb 100644 --- a/9.2/php8.0/apache-bullseye/Dockerfile +++ b/9.2/php8.0/apache-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php8.0/apache-buster/Dockerfile b/9.2/php8.0/apache-buster/Dockerfile index 6881f816a..367b3b133 100644 --- a/9.2/php8.0/apache-buster/Dockerfile +++ b/9.2/php8.0/apache-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php8.0/fpm-alpine3.15/Dockerfile b/9.2/php8.0/fpm-alpine3.15/Dockerfile index 6f8a4e6d6..0713c2047 100644 --- a/9.2/php8.0/fpm-alpine3.15/Dockerfile +++ b/9.2/php8.0/fpm-alpine3.15/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php7.4/fpm-alpine3.14/Dockerfile b/9.2/php8.0/fpm-alpine3.16/Dockerfile similarity index 97% rename from 9.3/php7.4/fpm-alpine3.14/Dockerfile rename to 9.2/php8.0/fpm-alpine3.16/Dockerfile index 278eb9019..16f784bab 100644 --- a/9.3/php7.4/fpm-alpine3.14/Dockerfile +++ b/9.2/php8.0/fpm-alpine3.16/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:7.4-fpm-alpine3.14 +FROM php:8.0-fpm-alpine3.16 # install the PHP extensions we need RUN set -eux; \ @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php8.0/fpm-bullseye/Dockerfile b/9.2/php8.0/fpm-bullseye/Dockerfile index 511125ef4..cb3358f86 100644 --- a/9.2/php8.0/fpm-bullseye/Dockerfile +++ b/9.2/php8.0/fpm-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php8.0/fpm-buster/Dockerfile b/9.2/php8.0/fpm-buster/Dockerfile index 45915ff91..79896d482 100644 --- a/9.2/php8.0/fpm-buster/Dockerfile +++ b/9.2/php8.0/fpm-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.2.20 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php7.4/apache-bullseye/Dockerfile b/9.3/php7.4/apache-bullseye/Dockerfile index da32b37e9..95eacf1f7 100644 --- a/9.3/php7.4/apache-bullseye/Dockerfile +++ b/9.3/php7.4/apache-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php7.4/apache-buster/Dockerfile b/9.3/php7.4/apache-buster/Dockerfile index 11c9dc74e..32d655b7b 100644 --- a/9.3/php7.4/apache-buster/Dockerfile +++ b/9.3/php7.4/apache-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php7.4/fpm-alpine3.15/Dockerfile b/9.3/php7.4/fpm-alpine3.15/Dockerfile index d243793bc..e8708b070 100644 --- a/9.3/php7.4/fpm-alpine3.15/Dockerfile +++ b/9.3/php7.4/fpm-alpine3.15/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php7.4/fpm-alpine3.14/Dockerfile b/9.3/php7.4/fpm-alpine3.16/Dockerfile similarity index 97% rename from 9.2/php7.4/fpm-alpine3.14/Dockerfile rename to 9.3/php7.4/fpm-alpine3.16/Dockerfile index f0df6aa7e..52d6ef5fc 100644 --- a/9.2/php7.4/fpm-alpine3.14/Dockerfile +++ b/9.3/php7.4/fpm-alpine3.16/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:7.4-fpm-alpine3.14 +FROM php:7.4-fpm-alpine3.16 # install the PHP extensions we need RUN set -eux; \ @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php7.4/fpm-bullseye/Dockerfile b/9.3/php7.4/fpm-bullseye/Dockerfile index cb397e08f..297c2a036 100644 --- a/9.3/php7.4/fpm-bullseye/Dockerfile +++ b/9.3/php7.4/fpm-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php7.4/fpm-buster/Dockerfile b/9.3/php7.4/fpm-buster/Dockerfile index 405763dde..5290315b4 100644 --- a/9.3/php7.4/fpm-buster/Dockerfile +++ b/9.3/php7.4/fpm-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/apache-bullseye/Dockerfile b/9.3/php8.0/apache-bullseye/Dockerfile index f4957fbd6..43edd8f91 100644 --- a/9.3/php8.0/apache-bullseye/Dockerfile +++ b/9.3/php8.0/apache-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/apache-buster/Dockerfile b/9.3/php8.0/apache-buster/Dockerfile index ea9f1d4a2..dae9c464d 100644 --- a/9.3/php8.0/apache-buster/Dockerfile +++ b/9.3/php8.0/apache-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-alpine3.15/Dockerfile b/9.3/php8.0/fpm-alpine3.15/Dockerfile index e48008a7f..90f05abdd 100644 --- a/9.3/php8.0/fpm-alpine3.15/Dockerfile +++ b/9.3/php8.0/fpm-alpine3.15/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.2/php8.0/fpm-alpine3.14/Dockerfile b/9.3/php8.0/fpm-alpine3.16/Dockerfile similarity index 97% rename from 9.2/php8.0/fpm-alpine3.14/Dockerfile rename to 9.3/php8.0/fpm-alpine3.16/Dockerfile index 7c6e29e4a..fac35b6c1 100644 --- a/9.2/php8.0/fpm-alpine3.14/Dockerfile +++ b/9.3/php8.0/fpm-alpine3.16/Dockerfile @@ -5,7 +5,7 @@ # # from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.0-fpm-alpine3.14 +FROM php:8.0-fpm-alpine3.16 # install the PHP extensions we need RUN set -eux; \ @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.2.19 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-bullseye/Dockerfile b/9.3/php8.0/fpm-bullseye/Dockerfile index 615ccdba9..fa51c39d6 100644 --- a/9.3/php8.0/fpm-bullseye/Dockerfile +++ b/9.3/php8.0/fpm-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.0/fpm-buster/Dockerfile b/9.3/php8.0/fpm-buster/Dockerfile index af32774fd..52cbf6b62 100644 --- a/9.3/php8.0/fpm-buster/Dockerfile +++ b/9.3/php8.0/fpm-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/apache-bullseye/Dockerfile b/9.3/php8.1/apache-bullseye/Dockerfile index 7d76bd78b..5888efc20 100644 --- a/9.3/php8.1/apache-bullseye/Dockerfile +++ b/9.3/php8.1/apache-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/apache-buster/Dockerfile b/9.3/php8.1/apache-buster/Dockerfile index c581e1696..4e7b28a47 100644 --- a/9.3/php8.1/apache-buster/Dockerfile +++ b/9.3/php8.1/apache-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-alpine3.14/Dockerfile b/9.3/php8.1/fpm-alpine3.14/Dockerfile deleted file mode 100644 index 4b29b5545..000000000 --- a/9.3/php8.1/fpm-alpine3.14/Dockerfile +++ /dev/null @@ -1,74 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://www.drupal.org/docs/system-requirements/php-requirements -FROM php:8.1-fpm-alpine3.14 - -# install the PHP extensions we need -RUN set -eux; \ - \ - apk add --no-cache --virtual .build-deps \ - coreutils \ - freetype-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ -# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642 - postgresql-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg=/usr/include \ - --with-webp \ - ; \ - \ - docker-php-ext-install -j "$(nproc)" \ - gd \ - opcache \ - pdo_mysql \ - pdo_pgsql \ - zip \ - ; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \ - apk del --no-network .build-deps - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ - -# https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 - -WORKDIR /opt/drupal -RUN set -eux; \ - export COMPOSER_HOME="$(mktemp -d)"; \ - composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ - chown -R www-data:www-data web/sites web/modules web/themes; \ - rmdir /var/www/html; \ - ln -sf /opt/drupal/web /var/www/html; \ - # delete composer cache - rm -rf "$COMPOSER_HOME" - -ENV PATH=${PATH}:/opt/drupal/vendor/bin - -# vim:set ft=dockerfile: diff --git a/9.3/php8.1/fpm-alpine3.15/Dockerfile b/9.3/php8.1/fpm-alpine3.15/Dockerfile index d374b350f..40464d859 100644 --- a/9.3/php8.1/fpm-alpine3.15/Dockerfile +++ b/9.3/php8.1/fpm-alpine3.15/Dockerfile @@ -57,7 +57,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-alpine3.16/Dockerfile b/9.3/php8.1/fpm-alpine3.16/Dockerfile new file mode 100644 index 000000000..92bbd5fff --- /dev/null +++ b/9.3/php8.1/fpm-alpine3.16/Dockerfile @@ -0,0 +1,74 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# from https://www.drupal.org/docs/system-requirements/php-requirements +FROM php:8.1-fpm-alpine3.16 + +# install the PHP extensions we need +RUN set -eux; \ + \ + apk add --no-cache --virtual .build-deps \ + coreutils \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libwebp-dev \ + libzip-dev \ +# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642 + postgresql-dev \ + ; \ + \ + docker-php-ext-configure gd \ + --with-freetype \ + --with-jpeg=/usr/include \ + --with-webp \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + gd \ + opcache \ + pdo_mysql \ + pdo_pgsql \ + zip \ + ; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .drupal-phpexts-rundeps $runDeps; \ + apk del --no-network .build-deps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ + +# https://www.drupal.org/node/3060/release +ENV DRUPAL_VERSION 9.3.14 + +WORKDIR /opt/drupal +RUN set -eux; \ + export COMPOSER_HOME="$(mktemp -d)"; \ + composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ + chown -R www-data:www-data web/sites web/modules web/themes; \ + rmdir /var/www/html; \ + ln -sf /opt/drupal/web /var/www/html; \ + # delete composer cache + rm -rf "$COMPOSER_HOME" + +ENV PATH=${PATH}:/opt/drupal/vendor/bin + +# vim:set ft=dockerfile: diff --git a/9.3/php8.1/fpm-bullseye/Dockerfile b/9.3/php8.1/fpm-bullseye/Dockerfile index 8093d7e4c..e8ebb5d2e 100644 --- a/9.3/php8.1/fpm-bullseye/Dockerfile +++ b/9.3/php8.1/fpm-bullseye/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/9.3/php8.1/fpm-buster/Dockerfile b/9.3/php8.1/fpm-buster/Dockerfile index bf7c6a6a7..30cf1e975 100644 --- a/9.3/php8.1/fpm-buster/Dockerfile +++ b/9.3/php8.1/fpm-buster/Dockerfile @@ -67,7 +67,7 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ # https://www.drupal.org/node/3060/release -ENV DRUPAL_VERSION 9.3.13 +ENV DRUPAL_VERSION 9.3.14 WORKDIR /opt/drupal RUN set -eux; \ diff --git a/versions.json b/versions.json index 1eadc78af..f177bba70 100644 --- a/versions.json +++ b/versions.json @@ -11,13 +11,13 @@ "fpm-bullseye", "apache-buster", "fpm-buster", - "fpm-alpine3.15", - "fpm-alpine3.14" + "fpm-alpine3.16", + "fpm-alpine3.15" ], "version": "10.0.0-alpha4" }, "7": { - "md5": "924e707e3b1e8269fe623cf2f22ee710", + "md5": "4cb30e74d1b57ef32d8efcd664e32f54", "phpVersions": [ "7.4" ], @@ -26,10 +26,10 @@ "fpm-bullseye", "apache-buster", "fpm-buster", - "fpm-alpine3.15", - "fpm-alpine3.14" + "fpm-alpine3.16", + "fpm-alpine3.15" ], - "version": "7.89" + "version": "7.90" }, "9.2": { "composer": { @@ -44,10 +44,10 @@ "fpm-bullseye", "apache-buster", "fpm-buster", - "fpm-alpine3.15", - "fpm-alpine3.14" + "fpm-alpine3.16", + "fpm-alpine3.15" ], - "version": "9.2.19" + "version": "9.2.20" }, "9.3": { "composer": { @@ -63,9 +63,9 @@ "fpm-bullseye", "apache-buster", "fpm-buster", - "fpm-alpine3.15", - "fpm-alpine3.14" + "fpm-alpine3.16", + "fpm-alpine3.15" ], - "version": "9.3.13" + "version": "9.3.14" } } diff --git a/versions.sh b/versions.sh index dd8d00cb7..e6afee6b2 100755 --- a/versions.sh +++ b/versions.sh @@ -89,8 +89,8 @@ for version in "${versions[@]}"; do variants: [ "bullseye", "buster", - "alpine3.15", - "alpine3.14" + "alpine3.16", + "alpine3.15" | if startswith("alpine") then empty else "apache-" + . end, "fpm-" + . ],