From bb974c288dc1a45dd89782f5de4ef7a928a3ffd5 Mon Sep 17 00:00:00 2001
From: Kilian PAQUIER <kilian@kilianpaquier.com>
Date: Fri, 8 Mar 2024 09:01:03 +0100
Subject: [PATCH] fix: keep default dependencies on jobs using
DOCKER_SNAPSHOT_IMAGE or DOCKER_RELEASE_IMAGE
---
templates/gitlab-ci-docker.yml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index bd373e5..8c8f0e1 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -850,7 +850,6 @@ docker-healthcheck:
extends: .docker-dind-base
variables:
GIT_STRATEGY: none
- dependencies: []
stage: package-test
script: |
# Test by internal health_check (Recommended way, more info https://docs.docker.com/engine/reference/builder/#healthcheck)
@@ -910,10 +909,8 @@ docker-healthcheck:
- !reference [.test-policy, rules]
# Security audit with trivy
-# This is a non-blocking job, it will always return (code) 0
docker-trivy:
extends: .docker-base
- dependencies: []
image:
name: $DOCKER_TRIVY_IMAGE
entrypoint: [""]
@@ -966,8 +963,6 @@ docker-sbom:
image:
name: $DOCKER_SBOM_IMAGE
entrypoint: [""]
- # force no dependency
- dependencies: []
script:
- mkdir -p -m 777 reports
- basename=$(echo "${DOCKER_SNAPSHOT_IMAGE}" | sed 's|[/:]|_|g')
--
GitLab