Update tagging logic

.gitlab-ci.yml

@@ -1,7 +1,8 @@
 image: docker:latest
 
 variables:
-  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+  BRANCH_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+  HASH_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
   LATEST_TAG: $CI_REGISTRY_IMAGE:latest
 
 stages:
@@ -10,12 +11,22 @@ stages:
 before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
+build:
+  stage: build
+  script:
+    - docker build --pull --no-cache -t $HASH_TAG .
+    - docker tag $HASH_TAG $BRANCH_TAG
+    - docker push $HASH_TAG
+    - docker push $BRANCH_TAG
+  except:
+    - master
+
 build-master:
   stage: build
   script:
-    - docker build --pull --no-cache -t $IMAGE_TAG .
-    - docker tag $IMAGE_TAG $LATEST_TAG
-    - docker push $IMAGE_TAG
+    - docker build --pull --no-cache -t $HASH_TAG .
+    - docker tag $HASH_TAG $LATEST_TAG
+    - docker push $HASH_TAG
     - docker push $LATEST_TAG
   only:
     - master