REFAC(ci)

.gitlab-ci.yml

@@ -47,10 +47,8 @@ docker-push:
   before_script:
     - |
       if expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
-      then
-      docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-      else
-      docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
+        then docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+      else docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
       fi
   script:
     # every commit on main branch should build image as unstable
@@ -58,13 +56,10 @@ docker-push:
     # hint: tags are references independent of branches
     - |
       if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
-      then
-      docker build -t $AURA_IMAGE_NAME:unstable .
+        then docker build -t $AURA_IMAGE_NAME:unstable .
       elif expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
-      then
-      docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME .
-      else
-      docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
+        then docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME .
+      else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
       fi
 
     # TODO: maybe isolate docker build and docker push