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..534b0ad9 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 @@ -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 \ diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli index 8115480b..2b980ac2 100644 --- a/images/php/Dockerfile.cli +++ b/images/php/Dockerfile.cli @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.1 +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 diff --git a/images/php/Dockerfile.fpm b/images/php/Dockerfile.fpm index 0d70674f..e845dfd3 100644 --- a/images/php/Dockerfile.fpm +++ b/images/php/Dockerfile.fpm @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.1 +ARG PHP_VERSION=8.3 FROM uselagoon/php-${PHP_VERSION}-fpm:latest RUN mkdir /bay