Merge branch 'develop' into trunk
This commit is contained in:
commit
953bf34bb3
2 changed files with 5 additions and 12 deletions
|
|
@ -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"
|
||||
|
|
@ -194,7 +194,7 @@ bun-build-test:
|
|||
|
||||
# * SECURITY ----------------------------------------------------------------
|
||||
|
||||
bun-security:
|
||||
npm-security:
|
||||
stage: security
|
||||
image: oven/bun:1
|
||||
before_script:
|
||||
|
|
@ -219,12 +219,3 @@ bun-security:
|
|||
|
||||
.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}"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue