tag after building

.gitlab-ci.yml

@@ -13,6 +13,7 @@ variables:
 stages:
   - test
   - build
+  - tag
   - publish
 
 test_job:
@@ -35,6 +36,23 @@ build_job:
       - artifact.bin
     expire_in: 5 min
 
+tag_job:
+  stage: tag
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "prod" || $CI_COMMIT_REF_NAME == "dev"
+      when: always
+  image: docker:latest
+  services:
+    - docker:dind
+  tags:
+    - docker-privileged
+  dependencies:
+    - build_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:
@@ -46,16 +64,8 @@ publish_job:
   tags:
     - docker-privileged
   dependencies:
-    - build_job
+    - tag_job
   script:
-    - docker buildx create --use
-    - docker buildx build \
-      --tag $CI_REGISTRY_IMAGE:$version \
-      --tag $CI_REGISTRY_IMAGE:latest \
-      --tag $CI_REGISTRY_IMAGE:$environment_tag \
-      --file Containerfile \
-      --output type=docker \
-      .
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - docker push $CI_REGISTRY_IMAGE:$version
     - docker push $CI_REGISTRY_IMAGE:latest