From c61c37dc2769ff3295401fc70eb67b698cb8f0d4 Mon Sep 17 00:00:00 2001
From: Rainer Killinger <git@killinger.co>
Date: Tue, 21 Apr 2020 11:04:21 +0200
Subject: [PATCH] ci: cleanup and add image tag of core version

---
 .gitlab-ci.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa0358de..e665a964 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,12 +74,17 @@ test:ci:
     - docker:dind
   script:
     - export REGISTRY_BRANCH=$(.gitlab/ci/getRegistryBranch.sh "$CI_JOB_NAME")
-    - export TAGNAME=$(.gitlab/ci/getRegistryTag.sh "$CI_BUILD_REF_NAME")
+    - export VERSION=$(.gitlab/ci/getRegistryTag.sh "$CI_COMMIT_REF_NAME")
+    - export CORE_VERSION=$(openstapps-projectmanagement get-used-version @openstapps/core)
+    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/$REGISTRY_BRANCH
+    - export IMAGETAG_CORE_VERSION=$IMAGETAG_BASE:core-$CORE_VERSION
+    - export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION
+    - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - docker build -t $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH:$TAGNAME .
-    - docker tag $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH:$TAGNAME $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH:latest
-    - docker push $CI_REGISTRY_IMAGE/$REGISTRY_BRANCH:$TAGNAME
-    - .gitlab/ci/pushAsLatestVersion.sh "$CI_BUILD_REF_NAME" "$CI_REGISTRY_IMAGE/$REGISTRY_BRANCH"
+    - docker build -t $IMAGETAG_LATEST -t $IMAGETAG_VERSION -t $IMAGETAG_CORE_VERSION .
+    - docker push $IMAGETAG_VERSION
+    - docker push $IMAGETAG_CORE_VERSION
+    - .gitlab/ci/pushAsLatestVersion.sh "$CI_COMMIT_REF_NAME" "$IMAGETAG_BASE"
   only:
     - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/
   tags: