From cbc447a11cd1997852ca34fd7ea06338b06a6a0f Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Mon, 26 Nov 2018 13:01:28 +0100 Subject: [PATCH] GitLab CI: Fix clean up stage we need to get the authorization token with the gitlab address, not the registry. Signed-off-by: Benjamin Tissoires --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5b723c..0dc616f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -390,6 +390,7 @@ freebsd:11.2@force-container-prep: script: # get the full container image name (CURRENT_CONTAINER_IMAGE still has indirections) - CONTAINER_IMAGE=$(eval echo "$CURRENT_CONTAINER_IMAGE") + - GITLAB=$(echo $CI_PROJECT_URL | cut -f3 -d/) - REPOSITORY=$(echo $CONTAINER_IMAGE | cut -f2- -d/) - IMAGE_PATH=$(echo $CONTAINER_IMAGE | cut -f1 -d:) @@ -402,7 +403,7 @@ freebsd:11.2@force-container-prep: - token=$(eval echo "\$$tokenname") # request a token for the registry API - - REGISTRY_TOKEN=$(curl https://$CI_REGISTRY/jwt/auth --get + - REGISTRY_TOKEN=$(curl https://$GITLAB/jwt/auth --get --silent --show-error -d client_id=docker -d offline_token=true -- 2.7.4