FIX(CI)

.gitlab-ci.yml

@@ -49,14 +49,12 @@ docker-push:
     # else it is from a tag (enforced by gitlab-ci rules)
     # hint: tags are references independent of branches
     - |
-      if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
-        then
-          docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME:unstable .
-        elif [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" =~ ^feat && "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "$CI_DEFAULT_BRANCH" ]
-          then
-            docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY" && docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-        else
-          docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
+      if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
+        docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME:unstable .
+      elif [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" =~ ^feat && "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "$CI_DEFAULT_BRANCH" ]; then
+        docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY" && docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+      else
+        docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
       fi
 
     # TODO: maybe isolate docker build and docker push