diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ba9a18728c16f432878644f598bee866cdca318..78c932ad622f61dbf80f620944825498a3b8aa58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -254,7 +254,6 @@ build-helm: - /^release-.*/ before_script: - apk add --no-cache helm make - - echo "$CI_GPG_KEYRING" | base64 -d > ./secring.gpg - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL script: - make build-helm @@ -544,8 +543,9 @@ release-helm: - "docker logout ${CI_REGISTRY2_URL}" - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}" - "mkdir -p ~/.gnupg" - - echo "$CI_GPG_KEYRING" | base64 -d > ~/.gnupg/secring.gpg - - echo "$CI_GPG_KEYRING2" | base64 -d > ~/.gnupg/pubring.gpg + - echo "CI_GPG_SECRING" | base64 -d > ~/.gnupg/secring.gpg + - echo "CI_GPG_PUBRING" | base64 -d > ~/.gnupg/pubring.gpg + - chmod 0644 ~/.gnupg/secring.gpg ~/.gnupg/pubring.gpg - helm registry login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_URL}" - helm registry login --username "${CI_REGISTRY2_USER}" --password "${CI_REGISTRY2_PASSWORD}" "${CI_REGISTRY2_URL}" - make build-helm