FIX(gitlab-ci)

.gitlab-ci.yml

@@ -44,29 +44,23 @@ docker-push:
     AURA_IMAGE_NAME: "autoradio/engine"
   services:
     - docker:dind
-  before_script:
-    # default repo is docker.io (aka docker hub)
-    - docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
   script:
     # every commit on main branch should build image as unstable
     # 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 build -t $AURA_IMAGE_NAME:unstable .
-        else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
-      fi
-
-    # If a merge request on a featrue branch is created 
-    # docker builds are tagged with branch name
-    # hint: The name of feature branches must begin with "feat"
-    - |
-      if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" =~ ^feat && "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "$CI_DEFAULT_BRANCH" ]
-        then 
-          docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-          docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+        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
     - docker push "$AURA_IMAGE_NAME" --all-tags