From b32e13ff678ad61f8dee61c337e42198ec43dca9 Mon Sep 17 00:00:00 2001 From: Pierre Smeyers Date: Fri, 14 Nov 2025 09:23:40 +0100 Subject: [PATCH 1/2] fix: broken GCP authentication GCP authentication is broken due to the fact that when merging Docker config files, the SNAPSHOT config takes precedence over RELEASE config (that contains GCP credentials) --- templates/gitlab-ci-docker.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 113c41d..581f058 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -829,7 +829,14 @@ stages: # use a merged auth config for the destination image echo "${docker_release_config_json}" > "$BUILDTOOL_HOME/skopeo/.docker/release-only.json" maybe_install_python3 - merge_json "$BUILDTOOL_HOME/skopeo/.docker/release-only.json" "$BUILDTOOL_HOME/skopeo/.docker/src-config.json" > "$BUILDTOOL_HOME/skopeo/.docker/dest-config.json" + if [ -f "${DOCKER_CONFIG_FILE}" ] + then + # $DOCKER_CONFIG_FILE takes precedence => src-config.json last + merge_json "$BUILDTOOL_HOME/skopeo/.docker/release-only.json" "$BUILDTOOL_HOME/skopeo/.docker/src-config.json" > "$BUILDTOOL_HOME/skopeo/.docker/dest-config.json" + else + # RELEASE auth takes precedence over SNAPSHOT => release-only.json last + merge_json "$BUILDTOOL_HOME/skopeo/.docker/src-config.json" "$BUILDTOOL_HOME/skopeo/.docker/release-only.json" > "$BUILDTOOL_HOME/skopeo/.docker/dest-config.json" + fi fi if [ "$docker_snapshot_registry_host" = "$docker_release_registry_host" ] -- GitLab From 515c4b24cc4c6f93d675bae5cc6997f84bd06335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20OLIVIER?= Date: Fri, 14 Nov 2025 09:37:13 +0100 Subject: [PATCH 2/2] doc(links): update broken links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f87ed5a..5d7d28f 100644 --- a/README.md +++ b/README.md @@ -339,7 +339,7 @@ In addition to a textual report in the console, this job produces the following | Report | Format | Usage | | -------------------------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `reports/docker-hadolint-*.native.json` | native hadolint test report (json) | [DefectDojo integration](https://docs.defectdojo.com/en/connecting_your_tools/parsers/file/hadolint/)
_This report is generated only if DefectDojo template is detected_ | +| `reports/docker-hadolint-*.native.json` | native hadolint test report (json) | [DefectDojo integration](https://docs.defectdojo.com/supported_tools/parsers/file/hadolint/)
_This report is generated only if DefectDojo template is detected_ | | `reports/docker-hadolint-*.codeclimate.json` | hadolint (GitLab) codeclimate format | [GitLab integration](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscodequality) | ### `docker-*-build` jobs @@ -483,7 +483,7 @@ In addition to a textual report in the console, this job produces the following | Report | Format | Usage | | ----------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `reports/docker-trivy-*.native.json` | Native Trivy report format (json) | [DefectDojo integration](https://docs.defectdojo.com/en/connecting_your_tools/parsers/file/trivy/)
_This report is generated only if DefectDojo template is detected_ | +| `reports/docker-trivy-*.native.json` | Native Trivy report format (json) | [DefectDojo integration](https://docs.defectdojo.com/supported_tools/parsers/file/trivy/)
_This report is generated only if DefectDojo template is detected_ | | `reports/docker-trivy-*.gitlab.json` | [Trivy report format for GitLab Container Security](https://trivy.dev/docs/latest/tutorials/integrations/gitlab-ci/) format | [GitLab Container Security](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscontainer_scanning) | | `reports/docker-trivy-*.gitlab-codequality.json` | [Trivy report format for GitLab Code Quality](https://trivy.dev/docs/latest/tutorials/integrations/gitlab-ci/) format | [GitLab Code Quality](https://docs.gitlab.com/ci/yaml/artifacts_reports/#artifactsreportscodequality) | -- GitLab