Updated definition of job .build_docker_image - ref. hive#406

.gitlab-ci.yml

@@ -68,21 +68,21 @@ lint_python_scripts:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
+    - tag=""
     - |
       if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
         echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-        docker build --target $BUILD_TARGET --pull -t "$CI_REGISTRY_IMAGE/$BUILD_TARGET:latest" .
-        docker push "$CI_REGISTRY_IMAGE/$BUILD_TARGET:latest"
+        tag=":latest"
+      else
+        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+        tag=":$CI_COMMIT_REF_SLUG" 
       fi
-      if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
-        echo "Running on main branch: tag = 'main-latest'"
-        docker build --target $BUILD_TARGET --pull -t "$CI_REGISTRY_IMAGE/$BUILD_TARGET:main-latest" .
-        docker push "$CI_REGISTRY_IMAGE/$BUILD_TARGET:main-latest"
-      fi
-      tag=":$CI_COMMIT_REF_SLUG"
-      echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
-      docker build --target $BUILD_TARGET --pull -t "$CI_REGISTRY_IMAGE/$BUILD_TARGET${tag}" .
-      docker push "$CI_REGISTRY_IMAGE/$BUILD_TARGET${tag}"
+    - |
+      docker build --target $BUILD_TARGET --pull \
+        -t "$CI_REGISTRY_IMAGE/$BUILD_TARGET${tag}" \
+        -t "$CI_REGISTRY_IMAGE/$BUILD_TARGET:$CI_COMMIT_SHA" .
+    -  docker push "$CI_REGISTRY_IMAGE/$BUILD_TARGET${tag}"
+    -  docker push "$CI_REGISTRY_IMAGE/$BUILD_TARGET:$CI_COMMIT_SHA"  
   rules:
     - if: $CI_COMMIT_BRANCH
       exists: