From fb7acad87cddc27623106c330228db86146faf58 Mon Sep 17 00:00:00 2001 From: AlphaRecon19 Date: Fri, 27 Jun 2025 21:42:44 +0100 Subject: [PATCH 1/3] Update alpine version and CI vales for DIND --- .gitlab-ci.yml | 6 +++++- Dockerfile | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad7f06a..5f1c46e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,13 @@ -image: docker:20 +image: docker:latest variables: DOCKER_HOST: tcp://docker:2375 + DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" +before_script: + - docker info + services: - docker:dind diff --git a/Dockerfile b/Dockerfile index f2f6543..aec900c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION=8 -ARG ALPINE_VERSION=3.18 +ARG ALPINE_VERSION=3.22 FROM php:${PHP_VERSION}-fpm-alpine WORKDIR /var/www From 25886e07f7846ec0542e7e9f81061636497d0646 Mon Sep 17 00:00:00 2001 From: AlphaRecon19 Date: Fri, 27 Jun 2025 21:50:13 +0100 Subject: [PATCH 2/3] Switch to docker:dind base image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f1c46e..c034331 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: docker:latest +image: docker:dind variables: DOCKER_HOST: tcp://docker:2375 From 974f825b7e36e518617df739b92d77e0d4e65c0e Mon Sep 17 00:00:00 2001 From: AlphaRecon19 Date: Fri, 27 Jun 2025 21:51:06 +0100 Subject: [PATCH 3/3] Remove before_script --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c034331..d19f22b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,6 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" -before_script: - - docker info - services: - docker:dind