From a27a558b3d9ddfc5507173e72ecd8e614d0e842e Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Thu, 9 Feb 2023 17:15:23 +0100
Subject: [PATCH] docker/gitlab-drupal-ci#20 Add PHP 8.2 and bump some tool
versions
---
.gitlab-ci.yml | 4 ++--
Dockerfile | 15 ++++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3a6889..1b740de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,14 +14,14 @@ php:
stage: build
parallel:
matrix:
- - ALPINE: '3.11'
- PHP: '7.3'
- ALPINE: '3.11'
PHP: '7.4'
- ALPINE: '3.12'
PHP: '8.0'
- ALPINE: '3.15'
PHP: '8.1'
+ - ALPINE: '3.17'
+ PHP: '8.2'
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 f53a12d..7b293b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,13 +12,13 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION
-ARG compose_version=2.4.1
-ARG glibc_version=2.28-r0
+ARG compose_version=2.16.0
+ARG glibc_version=2.35-r0
ARG apkArch
ARG dockerArch
ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=20.10.9
-ARG GIT_EXTRAS_VERSION=6.3.0
+ARG DOCKER_VERSION=23.0.0
+ARG GIT_EXTRAS_VERSION=6.5.0
ARG AHOY_VERSION=2.0.2
ARG GLAB_VERSION=1.25.3
@@ -72,6 +72,11 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
wget -q https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
apk add --no-cache --allow-untrusted glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
rm glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
+ elif [ "${ALPINE_VERSION}" = "3.17" ]; then \
+ apk add --no-cache mandoc py3-pip gettext bat ; \
+ wget -q https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
+ apk add --no-cache --allow-untrusted glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
+ rm glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
else \
apk add --no-cache mdocml-apropos ; \
python -m pip install --upgrade pip ; \
@@ -89,7 +94,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
\
wget -q https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -O /etc/apk/keys/sgerrand.rsa.pub && \
wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${glibc_version}/glibc-${glibc_version}.apk && \
- apk add --no-cache glibc-${glibc_version}.apk && \
+ apk add --no-cache --force-overwrite glibc-${glibc_version}.apk && \
rm glibc-${glibc_version}.apk && \
ln -sf /lib/libz.so.1 /usr/glibc-compat/lib/ && \
ln -sf /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
--
GitLab