Skip to content
Snippets Groups Projects
Commit 5bd4e723 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'dev/kpaquier/fix-ci-dependencies' into 'master'

fix: keep default dependencies on jobs using DOCKER_SNAPSHOT_IMAGE or DOCKER_RELEASE_IMAGE

See merge request to-be-continuous/docker!105
parents bc3ca66a bb974c28
Branches
Tags
No related merge requests found
......@@ -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')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment