Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -12,7 +12,7 @@ workflow:
         DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}
       when: always
     - variables:
-        DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}
+        DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}
       when: always
 
 Run CodiMD tests:
@@ -74,7 +74,7 @@ Remove dangling Docker image:
     - curl -L https://github.com/genuinetools/reg/releases/download/v0.13.0/reg-linux-amd64 > /bin/reg
     - chmod +x /bin/reg
   script:
-    - /bin/reg -d -r $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD rm "$CI_PROJECT_PATH:$CI_COMMIT_REF_NAME"
+    - /bin/reg -d -r $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD rm "$CI_PROJECT_PATH:$CI_COMMIT_BRANCH"
   rules:
     - if: $CI_MERGE_REQUEST_ID
       when: manual
@@ -86,7 +86,7 @@ Build CodiMD image:
   extends:
     - .build_base
   rules:
-    - if: '$CI_COMMIT_TAG || $CI_COMMIT_REF_NAME == "cernbox-integration"'
+    - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH == "cernbox-integration" || $CI_COMMIT_BRANCH == "dev"'
       when: on_success
 
 .deploy_base:
@@ -118,7 +118,6 @@ Deploy (DEV):
   rules:
     - if: $CI_COMMIT_BRANCH == "dev"
       when: on_success
-    - if: $CI_COMMIT_BRANCH
 
 Deploy (PROD):
   stage: deploy
@@ -134,11 +133,8 @@ Deploy (PROD):
   extends:
     - .deploy_base
   rules:
-    - if: '$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^cern-.*-prod$/'
+    - if: '$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^cern-.*-prod$/ && $CI_COMMIT_BRANCH == "master"'
       when: manual
-    - if: $CI_COMMIT_BRANCH == "master"
-      when: manual
-    - if: $CI_COMMIT_BRANCH
 
 Deploy (CERNBox integration):
   stage: deploy
@@ -154,5 +150,5 @@ Deploy (CERNBox integration):
   extends:
     - .deploy_base
   rules:
-    - if: '$CI_COMMIT_REF_NAME == "cernbox-integration"'
+    - if: '$CI_COMMIT_BRANCH == "cernbox-integration"'
       when: manual