From 33002a7a2c956ae2b5c7dbbf7636667b078ef7a6 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Mon, 16 Dec 2019 12:11:10 +0100
Subject: [PATCH] Clean up version

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59e16e1..7437c8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ docker:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
     - 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-/}"
+    - export VERSION="${IMAGENAME/c8-docker-base-8.x./}"
     - docker tag "${IMAGENAME}" "${CI_REGISTRY_IMAGE}:${VERSION}"
     - echo docker push "${CI_REGISTRY_IMAGE}:${VERSION}"
     - docker push "${CI_REGISTRY_IMAGE}:${VERSION}"
@@ -54,7 +54,7 @@ tag_latest:
   image: docker:19.03.0
   script:
     - export IMAGENAME=$(sed -e 's/Loaded image:\ \([[:alnum:]_\.\-]\+\).*/\1/g' load)
-    - export VERSION="${IMAGENAME/c8-docker-base-/}"
+    - export VERSION="${IMAGENAME/c8-docker-base-8.x./}"
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
     - docker pull "${CI_REGISTRY_IMAGE}:${VERSION}"
     - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "${CI_REGISTRY_IMAGE}:latest"
-- 
GitLab