Commit 0b4755bc authored by Girija Saint-Ange's avatar Girija Saint-Ange
Browse files

Merge branch 'fix/broken-gcp-auth' into 'master' 

fix: broken GCP authentication

Closes #168

See merge request to-be-continuous/docker!181
parents cdd42166 6bbabccc

README.md

+2 −2
Original line number Diff line number Diff line
@@ -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/)<br/>_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/)<br/>_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/)<br/>_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/)<br/>_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)                                                                     |

templates/gitlab-ci-docker.yml

+8 −1
Original line number Diff line number Diff line
@@ -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

      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" ]