Merge branch 'auto-releases' into 'master'

Update the CI prod and stable tags

See merge request uxf/vnc-hybridauth2!13

.gitlab-ci.yml

@@ -3,6 +3,7 @@ image: docker:19.03.1
 variables:
   DOCKER_HOST: tcp://localhost:2375
   DOCKER_TLS_CERTDIR: ''
+  DEV_CONTAINER_REGISTRY: eu.gcr.io/vnc-development/vnc-avatar:development
   IMAGE_TAG: eu.gcr.io/vnc-development/vnc-hybridauth-api:development-$CI_COMMIT_SHORT_SHA
   IMAGE_TAG_PROD: eu.gcr.io/vnc-dev-275609/vnc-hybridauth-api:production-$CI_COMMIT_SHORT_SHA
   IMAGE_TAG_STABLE: eu.gcr.io/vnc-stable/vnc-hybridauth-api:stable-$CI_COMMIT_SHORT_SHA
@@ -12,7 +13,7 @@ services:
 
 stages:
   - build_deb
-  - build_docker
+  - docker
   - notification
 
 deb:
@@ -41,7 +42,7 @@ deb:
 dev_deploy:  
   before_script:
     - base64 -d $SA_Development | docker login -u _json_key --password-stdin https://eu.gcr.io
-  stage: build_docker
+  stage: docker
   script:
     - cd docker
     - docker build -t $IMAGE_TAG .
@@ -51,25 +52,39 @@ dev_deploy:
 
 prod_deploy:
   before_script:
-    - base64 -d $SA_Production | docker login -u _json_key --password-stdin https://eu.gcr.io  
-  stage: build_docker
+    - 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
-  only:
-    - /prod_v.*/
+    - echo $CI_COMMIT_TAG
+    - COMMIT_VERSION=$(echo $CI_COMMIT_TAG | awk -F'prod-' '{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
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^prod\-(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/i
 
 stable_deploy:
   before_script:
-    - base64 -d $SA_Production | docker login -u _json_key --password-stdin https://eu.gcr.io  
-  stage: build_docker
+    - 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
-  only:
-    - /stable_v.*/
+    - echo $CI_COMMIT_TAG
+    - COMMIT_VERSION=$(echo $CI_COMMIT_TAG | awk -F'stable-' '{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
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^stable\-(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/i
 
 successful-results:
   image: eu.gcr.io/vnc-development/docker-vnc-deb-builder:latest