Fix & rename docker image tag variables

.gitlab-ci.yml

@@ -4,10 +4,10 @@ stages:
   - package
 
 variables:
-  SHA_TAG: $CI_REGISTRY_IMAGE/incremental:${CI_COMMIT_SHA}
-  INCREMENTAL_TAG: $CI_REGISTRY_IMAGE/incremental:latest
+  INCREMENTAL_SHA: $CI_REGISTRY_IMAGE/incremental:${CI_COMMIT_SHA}
+  INCREMENTAL_LATEST: $CI_REGISTRY_IMAGE/incremental:latest
   RELEASE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-  LATEST_RELEASE_TAG: $CI_REGISTRY_IMAGE:latest
+  RELEASE_LATEST: $CI_REGISTRY_IMAGE:latest
 
 # --------------------------------------------------------------------------------
 
@@ -58,10 +58,10 @@ incremental:
     - .docker
   needs: ['unit-test']
   script:
-    - docker build -t $SHA_TAG .
-    - docker tag $SHA_TAG $INCREMENTAL_TAG
-    - docker push $SHA_TAG
-    - docker push $INCREMENTAL_TAG
+    - docker build -t $INCREMENTAL_SHA .
+    - docker tag $INCREMENTAL_SHA $INCREMENTAL_LATEST
+    - docker push $INCREMENTAL_SHA
+    - docker push $INCREMENTAL_LATEST
 
 release:
   extends:
@@ -70,8 +70,8 @@ release:
   rules:
     - if: $CI_COMMIT_TAG
   script:
-    - docker pull $SHA_TAG
-    - docker tag $SHA_TAG $RELEASE_TAG
-    - docker tag $SHA_TAG $LATEST_TAG
+    - docker pull $INCREMENTAL_SHA
+    - docker tag $INCREMENTAL_SHA $RELEASE_TAG
+    - docker tag $INCREMENTAL_SHA $RELEASE_LATEST
     - docker push $RELEASE_TAG
-    - docker push $LATEST_RELEASE_TAG
+    - docker push $RELEASE_LATEST