Commit 36a3f02e authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '66-fix-oci-login-custom-port' into 'master' 

Helm publish function: Fix registry_host split for OCI login

See merge request to-be-continuous/helm!96
parents d074118d da973c1d

templates/gitlab-ci-helm.yml

+2 −2
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ stages: 
      then

        if [[ "$repo_user" ]] && [[ "$repo_password" ]]

        then

          registry_host=$(echo "$repo_url" | awk -F[/:] '{print $4}')

          registry_host=$(echo "$repo_url" | cut -d'/' -f3)

          log_info "--- login to OCI-registry \\e[32m${repo_name}\\e[0m: \\e[33;1m${registry_host}\\e[0m"

          export HELM_EXPERIMENTAL_OCI=1

          # shellcheck disable=SC2086
@@ -919,7 +919,7 @@ stages: 
    push)

      if [[ "$HELM_PUBLISH_URL" =~ oci://.* ]]

      then

        registry_host=$(echo "$HELM_PUBLISH_URL" | awk -F[/:] '{print $4}')

        registry_host=$(echo "$HELM_PUBLISH_URL" | cut -d'/' -f3)

        # shellcheck disable=SC2086

        echo "$password" | helm ${TRACE+--debug} registry login "$registry_host" --username "$username" --password-stdin

        # enable OCI support prior to v3.8.0