From deea2d77d051e75a599ec315e9bb988767f956bc Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Wed, 4 Dec 2024 09:19:28 +0100 Subject: [PATCH] Docker - Drupal - Bump PHP to 8.2 (#2824) * Docker - Drupal - Upgrade PHP * Docker - Drupal - Fix latest version * fix: instal curl --- docker/drupal/10/php8/debian12/10.2/apache/Dockerfile | 8 ++++++-- docker/drupal/10/php8/debian12/10.3/apache/Dockerfile | 8 ++++++-- docker/drupal/9/php8/debian11/9.5/apache/Dockerfile | 6 +++++- docker/drupal/templates/Dockerfile.template | 6 +++++- docker/drupal/versions.yaml | 4 ++-- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/docker/drupal/10/php8/debian12/10.2/apache/Dockerfile b/docker/drupal/10/php8/debian12/10.2/apache/Dockerfile index 49f10997b5..0a1bed636d 100644 --- a/docker/drupal/10/php8/debian12/10.2/apache/Dockerfile +++ b/docker/drupal/10/php8/debian12/10.2/apache/Dockerfile @@ -1,9 +1,11 @@ -FROM marketplace.gcr.io/google/php8-apache2:8.1 as ospo +FROM marketplace.gcr.io/google/debian12 as ospo # Download Licenses and restricted source-code COPY components.csv /components.csv COPY source_code.txt /source_code.txt +RUN apt update && apt -y install curl ca-certificates + RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \ && curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \ && chmod +x /download-licenses.sh \ @@ -13,7 +15,7 @@ RUN mkdir -p /usr/src/licenses \ && /download-licenses.sh /components.csv /usr/src/licenses \ && /download-ref-repos.sh /source_code.txt /usr/src -FROM marketplace.gcr.io/google/php8-apache2:8.1 +FROM marketplace.gcr.io/google/php8-apache2:8.2 COPY --from=ospo /usr/src /usr/src @@ -25,12 +27,14 @@ RUN set -ex; \ libjpeg-dev \ libpng-dev \ libpq-dev \ + libwebp-dev \ libzip-dev \ ; \ \ docker-php-ext-configure gd \ --with-freetype=/usr \ --with-jpeg=/usr \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/docker/drupal/10/php8/debian12/10.3/apache/Dockerfile b/docker/drupal/10/php8/debian12/10.3/apache/Dockerfile index 50e16d5a8e..42a9724875 100644 --- a/docker/drupal/10/php8/debian12/10.3/apache/Dockerfile +++ b/docker/drupal/10/php8/debian12/10.3/apache/Dockerfile @@ -1,9 +1,11 @@ -FROM marketplace.gcr.io/google/php8-apache2:8.1 as ospo +FROM marketplace.gcr.io/google/debian12 as ospo # Download Licenses and restricted source-code COPY components.csv /components.csv COPY source_code.txt /source_code.txt +RUN apt update && apt -y install curl ca-certificates + RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \ && curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \ && chmod +x /download-licenses.sh \ @@ -13,7 +15,7 @@ RUN mkdir -p /usr/src/licenses \ && /download-licenses.sh /components.csv /usr/src/licenses \ && /download-ref-repos.sh /source_code.txt /usr/src -FROM marketplace.gcr.io/google/php8-apache2:8.1 +FROM marketplace.gcr.io/google/php8-apache2:8.2 COPY --from=ospo /usr/src /usr/src @@ -25,12 +27,14 @@ RUN set -ex; \ libjpeg-dev \ libpng-dev \ libpq-dev \ + libwebp-dev \ libzip-dev \ ; \ \ docker-php-ext-configure gd \ --with-freetype=/usr \ --with-jpeg=/usr \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/docker/drupal/9/php8/debian11/9.5/apache/Dockerfile b/docker/drupal/9/php8/debian11/9.5/apache/Dockerfile index be0059b79a..6603f7415b 100644 --- a/docker/drupal/9/php8/debian11/9.5/apache/Dockerfile +++ b/docker/drupal/9/php8/debian11/9.5/apache/Dockerfile @@ -1,9 +1,11 @@ -FROM marketplace.gcr.io/google/php8-apache2:8.1 as ospo +FROM marketplace.gcr.io/google/debian12 as ospo # Download Licenses and restricted source-code COPY components.csv /components.csv COPY source_code.txt /source_code.txt +RUN apt update && apt -y install curl ca-certificates + RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \ && curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \ && chmod +x /download-licenses.sh \ @@ -25,12 +27,14 @@ RUN set -ex; \ libjpeg-dev \ libpng-dev \ libpq-dev \ + libwebp-dev \ libzip-dev \ ; \ \ docker-php-ext-configure gd \ --with-freetype=/usr \ --with-jpeg=/usr \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/docker/drupal/templates/Dockerfile.template b/docker/drupal/templates/Dockerfile.template index efc7be3ba8..b9e5cdbdb2 100644 --- a/docker/drupal/templates/Dockerfile.template +++ b/docker/drupal/templates/Dockerfile.template @@ -1,12 +1,14 @@ {{- $drupal := index .Packages "drupal" -}} {{- $composer := index .Packages "composer" -}} -FROM marketplace.gcr.io/google/php8-apache2:8.1 as ospo +FROM marketplace.gcr.io/google/debian12 as ospo # Download Licenses and restricted source-code COPY components.csv /components.csv COPY source_code.txt /source_code.txt +RUN apt update && apt -y install curl ca-certificates + RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \ && curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \ && chmod +x /download-licenses.sh \ @@ -28,12 +30,14 @@ RUN set -ex; \ libjpeg-dev \ libpng-dev \ libpq-dev \ + libwebp-dev \ libzip-dev \ ; \ \ docker-php-ext-configure gd \ --with-freetype=/usr \ --with-jpeg=/usr \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/docker/drupal/versions.yaml b/docker/drupal/versions.yaml index a13d0fdc34..256034aef6 100644 --- a/docker/drupal/versions.yaml +++ b/docker/drupal/versions.yaml @@ -20,7 +20,7 @@ cloudbuild: enable_parallel: false versions: - dir: 10/php8/debian12/10.3/apache - from: marketplace.gcr.io/google/php8-apache2:8.1 + from: marketplace.gcr.io/google/php8-apache2:8.2 packages: composer: gpg: f07934fad44f9048c0dc875a506cca31cc2794d6aebfc1867f3b1fbf48dce2c5 @@ -41,7 +41,7 @@ versions: - '10' - latest - dir: 10/php8/debian12/10.2/apache - from: marketplace.gcr.io/google/php8-apache2:8.1 + from: marketplace.gcr.io/google/php8-apache2:8.2 packages: composer: gpg: f07934fad44f9048c0dc875a506cca31cc2794d6aebfc1867f3b1fbf48dce2c5