Skip to content

Commit

Permalink
Update php base images to 8.3 (#219)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicksantamaria authored Jan 16, 2024
1 parent 2c897a6 commit a8c598a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
6 changes: 3 additions & 3 deletions images/awx-ee/execution-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 6 additions & 9 deletions images/ci-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion images/php/Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/php/Dockerfile.fpm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PHP_VERSION=8.1
ARG PHP_VERSION=8.3
FROM uselagoon/php-${PHP_VERSION}-fpm:latest

RUN mkdir /bay
Expand Down

0 comments on commit a8c598a

Please sign in to comment.