Merge branch '27-fix-broken-monorepo-target-registry-image' into 'beta' (aeb851b4) · Commits · git-mirror / Templates

container/kaniko.yml

+5 −5

Original line number	Diff line number	Diff line
		@@ -5,9 +5,8 @@
		# global variable for easy override
		variables:
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
		KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/dev
		KANIKO_TAG: ${CI_COMMIT_SHORT_SHA}
		KANIKO_DEV_TAG: ${CI_COMMIT_SHORT_SHA}
		KANIKO_DEV_TAG: dev-${CI_COMMIT_SHORT_SHA} # allows registry cleanup policy
		KANIKO_CONTEXT: ${CI_PROJECT_DIR}
		KANIKO_DOCKERFILE: "Dockerfile" # Can be a path
		KANIKO_EXTRA_ARGS: "" # See https://github.com/GoogleContainerTools/kaniko#additional-flags
		@@ -18,10 +17,12 @@ variables:
		image:
		name: gcr.io/kaniko-project/executor:debug
		entrypoint: [""]
		variables:
		KANIKO_DEV_TAG: dev-${CI_COMMIT_SHORT_SHA} # allows registry cleanup policy
		script:
		- echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} \| base64)\"}}}" > /kaniko/.docker/config.json
		- /kaniko/executor --cache=${KANIKO_CACHE} --context=${KANIKO_CONTEXT} --dockerfile=${KANIKO_DOCKERFILE} --destination=${KANIKO_DEV_REGISTRY_IMAGE}:${KANIKO_DEV_TAG} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_TAG} ${LABELS} ${KANIKO_EXTRA_ARGS}
		rules: # rules alter the tag used for the second destination
		- /kaniko/executor --cache=${KANIKO_CACHE} --context=${KANIKO_CONTEXT} --dockerfile=${KANIKO_DOCKERFILE} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_TAG} ${LABELS} ${KANIKO_EXTRA_ARGS}
		rules:
		# master/main
		- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
		variables:
		@@ -33,7 +34,6 @@ variables:
		# branches
		- if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
		variables:
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/branch
		KANIKO_TAG: ${CI_COMMIT_REF_SLUG}

		# default for polirepos

pipelines/container/polirepo.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,5 +5,5 @@ include:

		# set the project container dev image to the image for all jobs without a job-level default image
		image:
		name: ${KANIKO_DEV_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}
		name: ${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}
		entrypoint: [""]

tests/pipelines/container/monorepo.yml

+2 −4

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ kaniko:image_A:
		variables:
		KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_A
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/a
		KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/a/dev
		KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_A/Dockerfile

		kaniko:image_B:
		@@ -19,14 +18,13 @@ kaniko:image_B:
		variables:
		KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_B
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/b
		KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/b/dev
		KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/container/monorepo/image_B/Dockerfile

		grype:image_A:
		extends: .grype:monorepo
		variables:
		GRYPE_CONTEXT: a
		GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/a/dev:${KANIKO_DEV_TAG}
		GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/a:${KANIKO_DEV_TAG}
		needs: ["kaniko:image_A"]
		allow_failure: false

		@@ -34,6 +32,6 @@ grype:image_B:
		extends: .grype:monorepo
		variables:
		GRYPE_CONTEXT: b
		GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/b/dev:${KANIKO_DEV_TAG}
		GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/b:${KANIKO_DEV_TAG}
		needs: ["kaniko:image_B"]
		allow_failure: false

tests/pipelines/container/polirepo.yml

+1 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,7 @@ include:

		variables:
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo
		KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo/dev
		GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo/dev:${CI_COMMIT_SHORT_SHA}
		GRYPE_IMAGE: ${CI_REGISTRY_IMAGE}/container-polirepo:dev-${CI_COMMIT_SHORT_SHA}
		KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/container/polirepo
		KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/container/polirepo/Dockerfile
		GRYPE_FAIL_ON_THRESHOLD: ""

tests/pipelines/container/python.yml

+1 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ include:

		variables:
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/python-pep518
		KANIKO_DEV_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/python-pep518/dev
		KANIKO_CONTEXT: ${CI_PROJECT_DIR}/tests/mockup_projects/python/pep518
		KANIKO_DOCKERFILE: ${CI_PROJECT_DIR}/tests/mockup_projects/python/pep518/Dockerfile

		@@ -16,5 +15,5 @@ before_script:
		grype:
		variables:
		GRYPE_FAIL_ON_THRESHOLD: ""
		GRYPE_IMAGE: ${KANIKO_DEV_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}
		GRYPE_IMAGE: ${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG}
		allow_failure: false