From 12c449fd87f8249c4c1642e43ba19da597cad2a1 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Fri, 22 Nov 2019 18:36:25 +0100
Subject: [PATCH] CI_REGISTRY_IMAGE already includes CI_PROJECT_NAME
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5e3103..d2031a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,8 +37,8 @@ docker:
- docker load < `ls c8-docker-base-*.tar.xz` | tee load
- export IMAGENAME=$(sed -e 's/Loaded image:\ \([[:alnum:]_\.\-]\+\).*/\1/g' load)
- export VERSION="${IMAGENAME/c8-docker-base-/}"
- - docker tag "${IMAGENAME}" "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}"
- - docker push "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}"
+ - docker tag "${IMAGENAME}" "${CI_REGISTRY_IMAGE}:${VERSION}"
+ - docker push "${CI_REGISTRY_IMAGE}:${VERSION}"
artifacts:
paths:
- "load"
@@ -55,12 +55,12 @@ tag_latest:
- export IMAGENAME=$(sed -z -e 's/Loaded image:\ \([[:alnum:]_\.\-]\+\).*/\1/g' load)
- export VERSION="${IMAGENAME/c8-docker-base-/}"
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - docker pull "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}"
- - docker tag "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}" "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest"
- - docker push "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest"
+ - docker pull "${CI_REGISTRY_IMAGE}:${VERSION}"
+ - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "${CI_REGISTRY_IMAGE}:latest"
+ - docker push "${CI_REGISTRY_IMAGE}:latest"
- echo "${DOCKER_PWD}" | docker login -u "$DOCKER_USER" --password-stdin
- - docker tag "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}" "cern/${CI_PROJECT_NAME}:${VERSION}"
- - docker tag "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}" "cern/${CI_PROJECT_NAME}:latest"
+ - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "cern/${CI_PROJECT_NAME}:${VERSION}"
+ - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "cern/${CI_PROJECT_NAME}:latest"
- docker push "cern/${CI_PROJECT_NAME}:${VERSION}"
- docker push "cern/${CI_PROJECT_NAME}:latest"
when: manual
--
GitLab