From 7207109d63b56c710a109b62ccb9685df5989a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 16 Oct 2026 15:34:22 +0200 Subject: [PATCH 1/2] build: fix --- .gitlab-ci.yml | 15 +-------------- Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b1444d2..6e792b12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ include: file: "security/composer.yml" - project: "ldc-web/shared-ci" ref: "main" - file: "build/docker.yml" + file: "build/docker-multistage.yml" - project: "ldc-web/shared-ci" ref: "main" file: "test/test.yml" @@ -215,16 +215,3 @@ bun-security: - if: $CI_COMMIT_BRANCH == "trunk" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main" - if: $CI_COMMIT_TAG != null -# * BUILD ------------------------------------------------------------------- - -.docker-build: - dependencies: [] - needs: [] - script: - - /kaniko/executor - --context "${CI_PROJECT_DIR}" - --dockerfile "${CI_PROJECT_DIR}/Dockerfile" - --destination "${IMAGE_TAG}" - --build-arg GITLAB_USER="${CI_DEPLOY_USER}" - --build-arg GITLAB_PASSWORD="${CI_DEPLOY_PASSWORD}" - --build-arg PHP_8_5_TAG="${PHP_8_5_TAG:-latest}" diff --git a/Dockerfile b/Dockerfile index fde3b79f..15c06c64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ ARG PHP_8_5_TAG=latest -FROM composer:2.9 AS vendor +FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-ci-8.5:latest AS vendor + +WORKDIR /app ARG GITLAB_USER ARG GITLAB_PASSWORD From f86bf5424237cb27ada2ce005507d0bff4039e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 16 Oct 2026 16:24:22 +0200 Subject: [PATCH 2/2] build: fix --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e792b12..a4597308 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,7 +194,7 @@ bun-build-test: # * SECURITY ---------------------------------------------------------------- -bun-security: +npm-security: stage: security image: oven/bun:1 before_script: @@ -215,3 +215,7 @@ bun-security: - if: $CI_COMMIT_BRANCH == "trunk" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main" - if: $CI_COMMIT_TAG != null +# * BUILD ------------------------------------------------------------------- + +.docker-build: + dependencies: []