Commit 2b03e44b authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/cnb-image-split' into 'master' 

fix: correct split of cnb_image when registry port is present

See merge request to-be-continuous/cnb!7
parents aa8bc3e6 bfe7372f

templates/gitlab-ci-cnb.yml

+5 −5
Original line number Diff line number Diff line
@@ -356,8 +356,8 @@ cnb-build: 
  script:

    # required to allow Git operations while not owner

    - git config --global --add safe.directory $CI_PROJECT_DIR

    - cnb_repository=${CNB_SNAPSHOT_IMAGE%%:*}

    - cnb_tag=${CNB_SNAPSHOT_IMAGE#*:}

    - cnb_repository=${CNB_SNAPSHOT_IMAGE%:*}

    - cnb_tag=${CNB_SNAPSHOT_IMAGE##*:}

    # if not set: build cache image from snapshot image

    - |

      if [[ -z "$CNB_CACHE_IMAGE" ]]
@@ -408,8 +408,8 @@ cnb-publish: 
      fi

      skopeo copy --src-authfile ~/.docker/config.json --dest-authfile ~/.docker/release-config.json ${CNB_PUBLISH_ARGS} docker://$CNB_SNAPSHOT_IMAGE docker://$CNB_RELEASE_IMAGE

      log_info "Well done your image is published and can be downloaded by doing: docker pull $CNB_RELEASE_IMAGE"

    - cnb_repository=${CNB_RELEASE_IMAGE%%:*}

    - cnb_tag=${CNB_RELEASE_IMAGE#*:}

    - cnb_repository=${CNB_RELEASE_IMAGE%:*}

    - cnb_tag=${CNB_RELEASE_IMAGE##*:}

    - cnb_digest=$(skopeo inspect --authfile ~/.docker/release-config.json --format='{{ .Digest }}' "docker://$CNB_RELEASE_IMAGE")

    - |

      {