Commit 5a3931fb authored Oct 06, 2020 by FulcrandG

Keeping rules for docker_tag and trivy_tag as we only want to launch them on actual tags

parent 03a7aad3

jobs/docker/docker.yml

+6 −5

Original line number	Diff line number	Diff line
		@@ -16,8 +16,9 @@ docker_tag:
		name: gcr.io/kaniko-project/executor:debug-v0.20.0
		entrypoint: [""]
		script:
		- if [ -z ${CI_COMMIT_BRANCH} ]; then
		- mkdir -p /kaniko/.docker/
		- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
		- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG --destination $CI_REGISTRY_IMAGE:latest
		- fi
		No newline at end of file
		rules:
		- if: "$CI_COMMIT_TAG"

		No newline at end of file

jobs/trivy_image/trivy_image.yml

+3 −4

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ trivy_tag:
		extends: trivy
		variables:
		IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
		script:
		- if [ -z ${CI_COMMIT_TAG} ]; then
		- ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $IMAGE
		- fi
		rules:
		- if: "$CI_COMMIT_TAG"