Commit bcba155e authored by Clement Bois's avatar Clement Bois
Browse files

Merge branch '157-docker_registry_release_password-override-docker_config_file' into 'master' 

Resolve "DOCKER_REGISTRY_RELEASE_PASSWORD override DOCKER_CONFIG_FILE"

Closes #157

See merge request to-be-continuous/docker!180
parents e90bc25b 8fe3544d

templates/gitlab-ci-docker.yml

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ 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/src-config.json" "$BUILDTOOL_HOME/skopeo/.docker/release-only.json" > "$BUILDTOOL_HOME/skopeo/.docker/dest-config.json"

      merge_json "$BUILDTOOL_HOME/skopeo/.docker/release-only.json" "$BUILDTOOL_HOME/skopeo/.docker/src-config.json" > "$BUILDTOOL_HOME/skopeo/.docker/dest-config.json"

    fi



    if [ "$docker_snapshot_registry_host" = "$docker_release_registry_host" ]