From cb4ed3fa509c1db48a82a85507167eff15e45bbe Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Sat, 2 Mar 2024 14:49:04 +0100
Subject: [PATCH] docker/gitlab-drupal-ci#51 Add support for PHP 8.3 and
upgrade docker to 25.0.3
---
.gitlab-ci.yml | 2 ++
Dockerfile | 9 +++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0ebcb6..5fa0a48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,8 @@ php:
PHP: '8.1'
- ALPINE: '3.17'
PHP: '8.2'
+ - ALPINE: '3.18'
+ PHP: '8.3'
script:
- docker build --pull --build-arg ALPINE_VERSION=${ALPINE} --build-arg PHP_MAJOR_VERSION=${PHP} --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
- docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}
diff --git a/Dockerfile b/Dockerfile
index 4e69c86..4c873ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ ARG PHP_MAJOR_VERSION
ARG AHOY_VERSION=2.1.1
ARG DIFFTASTIC_VERSION=0.55.0
ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=24.0.7
+# Check for latest at https://download.docker.com/linux/static/stable/x86_64/
+ARG DOCKER_VERSION=25.0.3
ARG GIT_EXTRAS_VERSION=7.1.0
ARG GLAB_VERSION=1.36.0
ARG apkArch
@@ -125,9 +126,9 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
rm -rf git-extras && \
\
curl -SL https://gitlab.lakedrops.com/ansible/playbooks/general/-/raw/main/plugins/_lookup/healthchecks.py -o /usr/local/bin/healthchecks.py && \
- chmod +x /usr/local/bin/healthchecks.py && \
- \
- docker-php-ext-install \
+ chmod +x /usr/local/bin/healthchecks.py
+
+RUN docker-php-ext-install \
bcmath \
gd \
zip && \
--
GitLab