From 00e6312ef0203a259cd3fc7cc936995951aac239 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Wed, 25 Oct 2023 11:23:24 +1100 Subject: [PATCH 1/6] Update php-cli to 8.2 --- images/php/Dockerfile.cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli index e7b402cb..282340ab 100644 --- a/images/php/Dockerfile.cli +++ b/images/php/Dockerfile.cli @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.1 +ARG PHP_VERSION=8.2 FROM php:${PHP_VERSION}-cli-alpine AS php-cli FROM skpr/mtk-dump:v3-latest AS mtk-dump FROM uselagoon/php-${PHP_VERSION}-cli-drupal:latest From b05da9576620113762439ca7c9cde72f14c03886 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Wed, 25 Oct 2023 11:24:15 +1100 Subject: [PATCH 2/6] Update php-fpm image to 8.2 --- images/php/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/Dockerfile.fpm b/images/php/Dockerfile.fpm index 0d70674f..11c5f02c 100644 --- a/images/php/Dockerfile.fpm +++ b/images/php/Dockerfile.fpm @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.1 +ARG PHP_VERSION=8.2 FROM uselagoon/php-${PHP_VERSION}-fpm:latest RUN mkdir /bay From 065362aae9e626dafd895f7962668f1393279d55 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Tue, 16 Jan 2024 15:49:53 +1100 Subject: [PATCH 3/6] Update cli image to php 8.3 --- images/php/Dockerfile.cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli index 35dc4f98..de54ce63 100644 --- a/images/php/Dockerfile.cli +++ b/images/php/Dockerfile.cli @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.2 +ARG PHP_VERSION=8.3 FROM php:${PHP_VERSION}-cli-alpine AS php-cli FROM ghcr.io/skpr/mtk:latest AS mtk FROM uselagoon/php-${PHP_VERSION}-cli-drupal:latest From a779dbe61c57552a8152e7e95907fe1c92a4e906 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Tue, 16 Jan 2024 15:50:16 +1100 Subject: [PATCH 4/6] Update fpm to php 8.3 --- images/php/Dockerfile.fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/Dockerfile.fpm b/images/php/Dockerfile.fpm index 11c5f02c..e845dfd3 100644 --- a/images/php/Dockerfile.fpm +++ b/images/php/Dockerfile.fpm @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.2 +ARG PHP_VERSION=8.3 FROM uselagoon/php-${PHP_VERSION}-fpm:latest RUN mkdir /bay From 2f53b56eb3ca5707c5f70f1e4ebf36d2ee412c3a Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Tue, 16 Jan 2024 16:04:56 +1100 Subject: [PATCH 5/6] Updated php version in ci-builder image. --- images/awx-ee/execution-environment.yml | 6 +++--- images/ci-builder/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index ff185eb9..28ab2ef8 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -40,9 +40,9 @@ additional_build_steps: RUN set -eux; \ curl -sSL https://packages.sury.org/php/README.txt | bash -x; \ apt-get update && apt-get install -y \ - php8.1-cli \ - php8.1-gd \ - php8.1-zip; \ + php8.3-cli \ + php8.3-gd \ + php8.3-zip; \ rm -rf /var/lib/apt/lists/*; - | # Install cli tools. diff --git a/images/ci-builder/Dockerfile b/images/ci-builder/Dockerfile index efdbe4b9..93cfb5a8 100644 --- a/images/ci-builder/Dockerfile +++ b/images/ci-builder/Dockerfile @@ -1,5 +1,5 @@ FROM hashicorp/terraform:latest AS terraform -FROM php:8.1-cli-alpine +FROM php:8.3-cli-alpine ARG AHOY_VERSION=2.1.1 ARG GOJQ_VERSION=0.12.4 ARG HUB_VERSION=2.14.2 From a076be130a9e43971b3bc0c73d7d8a4b6680f800 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Tue, 16 Jan 2024 16:21:06 +1100 Subject: [PATCH 6/6] Fixed python package installation --- images/ci-builder/Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/images/ci-builder/Dockerfile b/images/ci-builder/Dockerfile index 93cfb5a8..534b0ad9 100644 --- a/images/ci-builder/Dockerfile +++ b/images/ci-builder/Dockerfile @@ -38,15 +38,12 @@ RUN curl -L "https://github.com/github/hub/releases/download/v${HUB_VERSION}/hub chmod +x /tmp/hub-linux-386-${HUB_VERSION}/bin/hub && \ mv /tmp/hub-linux-386-${HUB_VERSION}/bin/hub /usr/local/bin -# Install Python dependencies not available in apk. -RUN pip install --ignore-installed \ - flake8 \ - yamllint \ - ansible-lint \ - boto3 - -## Install required PHP extensions for Drupal +## Install required PHP extensions for Drupal and python packages. RUN apk add --no-cache \ + py3-flake8 \ + py3-ansible-lint \ + py3-boto3 \ + yamllint \ libpng \ libpng-dev \ libjpeg-turbo-dev \