Skip to content
Snippets Groups Projects
Commit 44a895ca authored by Rémi - Le Filament's avatar Rémi - Le Filament
Browse files

[UPD] docker image version

parent 79fb6d2d
Branches 14-RV-20250305
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings # Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
# Note that environment variables can be set in several places # Note that environment variables can be set in several places
# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence # See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
image: docker:20.10.17 image: docker:24
include: include:
- template: Security/Container-Scanning.gitlab-ci.yml - template: Security/Container-Scanning.gitlab-ci.yml
- template: Security/Secret-Detection.gitlab-ci.yml - template: Security/Secret-Detection.gitlab-ci.yml
...@@ -14,10 +14,10 @@ container_scanning: ...@@ -14,10 +14,10 @@ container_scanning:
DOCKER_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH" DOCKER_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH"
DOCKERFILE_PATH: "$CI_COMMIT_BRANCH.Dockerfile" DOCKERFILE_PATH: "$CI_COMMIT_BRANCH.Dockerfile"
docker-build-10.0: docker-build-10.0:
image: docker:20.10.17 image: docker:24
stage: build stage: build
services: services:
- docker:20.10.17-dind - docker:24-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
...@@ -26,10 +26,10 @@ docker-build-10.0: ...@@ -26,10 +26,10 @@ docker-build-10.0:
only: only:
- '10.0' - '10.0'
docker-build-12.0: docker-build-12.0:
image: docker:20.10.17 image: docker:24
stage: build stage: build
services: services:
- docker:20.10.17-dind - docker:24-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
...@@ -43,10 +43,10 @@ docker-build-12.0: ...@@ -43,10 +43,10 @@ docker-build-12.0:
only: only:
- '12.0' - '12.0'
docker-build-14.0: docker-build-14.0:
image: docker:20.10.17 image: docker:24
stage: build stage: build
services: services:
- docker:20.10.17-dind - docker:24-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
...@@ -55,10 +55,10 @@ docker-build-14.0: ...@@ -55,10 +55,10 @@ docker-build-14.0:
only: only:
- '14.0' - '14.0'
docker-build-16.0: docker-build-16.0:
image: docker:20.10.17 image: docker:24
stage: build stage: build
services: services:
- docker:20.10.17-dind - docker:24-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
...@@ -67,10 +67,10 @@ docker-build-16.0: ...@@ -67,10 +67,10 @@ docker-build-16.0:
only: only:
- '16.0' - '16.0'
# docker-build-16.0-scratch: # docker-build-16.0-scratch:
# image: docker:20.10.17 # image: docker:24
# stage: build # stage: build
# services: # services:
# - docker:20.10.17-dind # - docker:24-dind
# before_script: # before_script:
# - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY # - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# script: # script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment