Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -5,8 +5,7 @@ stages:
 
 variables:
   CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_BEFORE_SHA
-  CONTAINER_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
+  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
 
 before_script:
   - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
@@ -16,10 +15,6 @@ build-except-master:
   script:
     - docker build -t $CONTAINER_TEST_IMAGE .
     - docker push $CONTAINER_TEST_IMAGE
-  only:
-    - branches
-  except:
-    - master
   tags:
     - dvlp
     - infrastructure
@@ -29,10 +24,6 @@ test:
   script:
     - docker pull $CONTAINER_TEST_IMAGE
     - docker run $CONTAINER_TEST_IMAGE /bin/sh
-  only:
-    - branches
-  except:
-    - master
   tags:
     - dvlp
     - infrastructure
@@ -40,9 +31,9 @@ test:
 release-image:
   stage: release
   script:
-    - docker pull $CONTAINER_RELEASE_IMAGE
-    - docker tag $CONTAINER_RELEASE_IMAGE $CONTAINER_RELEASE_IMAGE_TAG
-    - docker push $CONTAINER_RELEASE_IMAGE_TAG
+    - docker pull $CONTAINER_TEST_IMAGE
+    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
+    - docker push $CONTAINER_RELEASE_IMAGE
   only:
     - master
   tags: