REFAC(CI)

.gitlab-ci.yml

@@ -44,6 +44,14 @@ docker-push:
     AURA_IMAGE_NAME: "autoradio/engine"
   services:
     - docker:dind
+  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"
+      fi
   script:
     # every commit on main branch should build image as unstable
     # else it is from a tag (enforced by gitlab-ci rules)
@@ -51,12 +59,12 @@ docker-push:
     - |
       if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
       then
-      docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH" && docker build -t $AURA_IMAGE_NAME:unstable .
+      docker build -t $AURA_IMAGE_NAME:unstable .
       elif expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
       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 .
+      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 .
+      docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
       fi
 
     # TODO: maybe isolate docker build and docker push