diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2018-11-26 13:01:28 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-11-28 00:56:44 +0000 |
| commit | cbc447a11cd1997852ca34fd7ea06338b06a6a0f (patch) | |
| tree | aa2f4a83f598f51860d43573a577f83f07e4c921 | |
| parent | c104f4fb28c40f1b6c146d63a291ecc5e766317a (diff) | |
| download | libinput-wip/gitlab-ci.tar.gz | |
GitLab CI: Fix clean up stagewip/gitlab-ci
we need to get the authorization token with the gitlab address, not
the registry.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5b723c7..0dc616f0 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 |