REFAC(gitlab-ci): refac build stage

.gitlab-ci.yml

@@ -64,8 +64,11 @@ build:
     - go build -ldflags "-extldflags '-static'" -tags netgo -o $CI_PROJECT_DIR/tank ./cmd/tank
     ## sqlite needs cgo... :(
     ##- go build -o $CI_PROJECT_DIR/tank ./cmd/tank
-  only:
-    - master
+  rules:
+    # every commit on main or feature branch should trigger a push to gitlab registry
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feat/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^fix/
+      exists:
+        - Dockerfile
   artifacts:
     paths:
       - tank
@@ -118,20 +121,36 @@ deploy_spec:
       when: always
 
 docker:
+  # Use the official docker image.
+  image: docker:latest
   stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
+  variables:
+    # the name of the image without version
+    AURA_IMAGE_NAME: "autoradio/tank"
+  services:
+    - docker:dind
   cache:
     paths:
       - .docker/cache
     key: default
     policy: pull-push
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
   script:
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-  only:
-    - master
+    - |
+      if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
+        then docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:main .
+        docker push $CI_REGISTRY_IMAGE:main 
+      elif expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null | "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^fix > /dev/null
+        then docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME .
+        docker push $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+      fi
+
+  rules:
+    # every commit on main or feature branch should trigger a push to gitlab registry
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feat/
+      exists:
+        - Dockerfile
 
 test-scheme:
   stage: test-build
@@ -190,34 +209,23 @@ docker-hub-push:
   services:
     - docker:dind
   before_script:
-    # on a feature branch will login to gitlab registry
-    # else to docker hub
-    # hint: feature branches must begin with "feat"
-    - |
-      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
+    # 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 and push image as unstable
-    # elseif its a feature branch build and push to gitlab registry
+    # 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
-    # hint: feature branches must begin with "feat"
     - |
       if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
         then docker build -t $AURA_IMAGE_NAME:unstable .
-        docker push $AURA_IMAGE_NAME:unstable 
-      elif expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
-        then docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME .
-        docker push $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-      else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
-      docker push $AURA_IMAGE_NAME:$CI_COMMIT_TAG
+        else 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
   rules:
     - *release-rules
-    # every commit on master/main or feature branch should trigger a push
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feat/
+    # every commit on master/main branch should trigger a push to docker-hub as unstable without a release
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       exists:
         - Dockerfile