Fixed docker build pipeline for prod and stable images

.gitlab-ci.yml

@@ -3,9 +3,10 @@ image: docker:19.03.1
 variables:
   DOCKER_HOST: tcp://localhost:2375
   DOCKER_TLS_CERTDIR: ''
-  IMAGE_TAG: eu.gcr.io/vnc-development/vnc-avatar:development-$CI_COMMIT_SHORT_SHA
-  IMAGE_TAG_PROD: eu.gcr.io/vnc-dev-275609/vnc-avatar:production-$CI_COMMIT_SHORT_SHA
-  IMAGE_TAG_STABLE: eu.gcr.io/stable/vnc-avatar:stable-$CI_COMMIT_SHORT_SHA
+  DEV_CONTAINER_REGISTRY: eu.gcr.io/vnc-development/vnc-avatar:development
+  IMAGE_TAG: $DEV_CONTAINER_REGISTRY-$CI_COMMIT_SHORT_SHA
+  IMAGE_TAG_PROD: eu.gcr.io/vnc-dev-275609/vnc-avatar:production
+  IMAGE_TAG_STABLE: eu.gcr.io/stable/vnc-avatar:stable
 
 
 services:
@@ -52,9 +53,16 @@ prod_deploy:
     - base64 -d $SA_Production | docker login -u _json_key --password-stdin https://eu.gcr.io  
   stage: docker
   script:
-    - docker pull $IMAGE_TAG
-    - docker tag $IMAGE_TAG $IMAGE_TAG_PROD
-    - docker push $IMAGE_TAG_PROD
+    - echo $CI_COMMIT_TAG
+    - COMMIT_VERSION=$(echo $CI_COMMIT_TAG | awk -F'prod_v' '{print $2}')
+    - echo $COMMIT_VERSION
+
+    - DEV_TAG=$DEV_CONTAINER_REGISTRY-$COMMIT_VERSION
+    - echo $DEV_TAG
+    - docker pull $DEV_TAG
+    - PROD_IMAGE=$IMAGE_TAG_PROD-$COMMIT_VERSION
+    - docker tag $DEV_TAG $PROD_IMAGE
+    - docker push $PROD_IMAGE
   only:
     - /prod_v.*/
 
@@ -63,9 +71,16 @@ stable_deploy:
     - base64 -d $SA_Production | docker login -u _json_key --password-stdin https://eu.gcr.io  
   stage: docker
   script:
-    - docker pull $IMAGE_TAG
-    - docker tag $IMAGE_TAG $IMAGE_TAG_STABLE
-    - docker push $IMAGE_TAG_STABLE
+    - echo $CI_COMMIT_TAG
+    - COMMIT_VERSION=$(echo $CI_COMMIT_TAG | awk -F'stable_v' '{print $2}')
+    - echo $COMMIT_VERSION
+
+    - DEV_TAG=$DEV_CONTAINER_REGISTRY-$COMMIT_VERSION
+    - echo $DEV_TAG
+    - docker pull $DEV_TAG
+    - STABLE_IMAGE=$IMAGE_TAG_STABLE-$COMMIT_VERSION
+    - docker tag $DEV_TAG $STABLE_IMAGE
+    - docker push $STABLE_IMAGE
   only:
     - /stable_v.*/