only build and tag on dev and prod

.gitlab-ci.yml

@@ -7,13 +7,10 @@ workflow:
 
 variables:
   version: 0.0.$CI_PIPELINE_IID
-  environment_tag: |
-    if [ "$CI_COMMIT_BRANCH" == "prod" ]; then echo "prod"; else echo "dev"; fi
 
 stages:
   - test
   - build
-  - tag
   - publish
 
 test_job:
@@ -26,7 +23,7 @@ test_job:
 build_job:
   stage: build
   rules:
-    - if: $CI_COMMIT_REF_NAME == "prod" || $CI_COMMIT_REF_NAME == "dev"
+    - if: $CI_COMMIT_REF_NAME =~ /prod|dev/
       when: always
   image: public.ecr.aws/docker/library/golang:1.21
   script: |
@@ -36,10 +33,10 @@ build_job:
       - artifact.bin
     expire_in: 5 min
 
-tag_job:
-  stage: tag
+publish_job:
+  stage: publish
   rules:
-    - if: $CI_COMMIT_REF_NAME == "prod" || $CI_COMMIT_REF_NAME == "dev"
+    - if: $CI_COMMIT_REF_NAME =~ /prod|dev/
       when: always
   image: docker:latest
   services:
@@ -51,24 +48,18 @@ tag_job:
   script:
     - docker build -t $CI_REGISTRY_IMAGE:$version -f Containerfile .
     - docker tag $CI_REGISTRY_IMAGE:$version $CI_REGISTRY_IMAGE:latest
-    - docker tag $CI_REGISTRY_IMAGE:$version $CI_REGISTRY_IMAGE:$environment_tag
-
-publish_job:
-  stage: publish
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "prod" || $CI_COMMIT_REF_NAME == "dev"
-      when: always
-  image: docker:latest
-  services:
-    - docker:dind
-  tags:
-    - docker-privileged
-  dependencies:
-    - tag_job
-  script:
+    - if [[ "$CI_COMMIT_BRANCH" == "prod" ]]; then
+      docker tag $CI_REGISTRY_IMAGE:$version $CI_REGISTRY_IMAGE:prod;
+      elif [[ "$CI_COMMIT_BRANCH" == "dev" ]]; then
+      docker tag $CI_REGISTRY_IMAGE:$version $CI_REGISTRY_IMAGE:dev;
+      fi
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - docker push $CI_REGISTRY_IMAGE:$version
     - docker push $CI_REGISTRY_IMAGE:latest
-    - docker push $CI_REGISTRY_IMAGE:$environment_tag
+    - if [[ "$CI_COMMIT_BRANCH" == "prod" ]]; then
+      docker push $CI_REGISTRY_IMAGE:prod;
+      elif [[ "$CI_COMMIT_BRANCH" == "dev" ]]; then
+      docker push $CI_REGISTRY_IMAGE:dev;
+      fi
   after_script:
     - docker logout $CI_REGISTRY