From 39a4dae7a57f05a4588cea51a74182c675043518 Mon Sep 17 00:00:00 2001 From: sfrancois Date: Wed, 19 Jul 2023 11:22:56 +0200 Subject: [PATCH 1/2] =?UTF-8?q?style:=20enl=C3=A8ve=20espaces=20suppl?= =?UTF-8?q?=C3=A9mentaires=20dans=20template=20vul-scan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/vul-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/vul-scan.yml b/templates/vul-scan.yml index 23661aa..e6f5701 100644 --- a/templates/vul-scan.yml +++ b/templates/vul-scan.yml @@ -55,6 +55,6 @@ expire_in: 7 days when: on_failure reports: - container_scanning: gl-container-scanning-report.json + container_scanning: gl-container-scanning-report.json tags: - trivy -- GitLab From a19a7b45f13d76b93c7ed1eba3d1e2cce9e044c0 Mon Sep 17 00:00:00 2001 From: sfrancois Date: Wed, 19 Jul 2023 11:46:51 +0200 Subject: [PATCH 2/2] feat(docker): met en place les templates des versions de docker Versions : 18, 20, 23 et 24 avec DinD --- templates/docker-18.yml | 8 ++++++++ templates/docker-20.yml | 8 ++++++++ templates/docker-23.yml | 8 ++++++++ templates/docker-24.yml | 8 ++++++++ templates/registry.yml | 9 +++++++++ 5 files changed, 41 insertions(+) create mode 100644 templates/docker-18.yml create mode 100644 templates/docker-20.yml create mode 100644 templates/docker-23.yml create mode 100644 templates/docker-24.yml create mode 100644 templates/registry.yml diff --git a/templates/docker-18.yml b/templates/docker-18.yml new file mode 100644 index 0000000..8697722 --- /dev/null +++ b/templates/docker-18.yml @@ -0,0 +1,8 @@ +.docker: + image: docker:18 + environment: + DOCKER_BUILDKIT: 1 + services: + - name: docker:18-dind-rootless + tags: + - docker-images diff --git a/templates/docker-20.yml b/templates/docker-20.yml new file mode 100644 index 0000000..11375ef --- /dev/null +++ b/templates/docker-20.yml @@ -0,0 +1,8 @@ +.docker: + image: docker:20 + environment: + DOCKER_BUILDKIT: 1 + services: + - name: docker:20-dind-rootless + tags: + - docker-images diff --git a/templates/docker-23.yml b/templates/docker-23.yml new file mode 100644 index 0000000..595f0a9 --- /dev/null +++ b/templates/docker-23.yml @@ -0,0 +1,8 @@ +.docker: + image: docker:23 + environment: + DOCKER_BUILDKIT: 1 + services: + - name: docker:23-dind-rootless + tags: + - docker-images diff --git a/templates/docker-24.yml b/templates/docker-24.yml new file mode 100644 index 0000000..c81c32e --- /dev/null +++ b/templates/docker-24.yml @@ -0,0 +1,8 @@ +.docker: + image: docker:24 + environment: + DOCKER_BUILDKIT: 1 + services: + - name: docker:24-dind-rootless + tags: + - docker-images diff --git a/templates/registry.yml b/templates/registry.yml new file mode 100644 index 0000000..3cbc8c1 --- /dev/null +++ b/templates/registry.yml @@ -0,0 +1,9 @@ +.nexus: + extends: .docker + before_script: + - echo "$NEXUS_CREDS_PSW" | docker login -u $NEXUS_CREDS_USR --password-stdin $PATRINAT_REGISTRY + +.gitlab-registry: + extends: .docker + before_script: + - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY -- GitLab