From 9c4353ee79b4ceb687c81361acdd4eb63c62084c Mon Sep 17 00:00:00 2001
From: Amelia Yukii <amelia.yukii@shourai.de>
Date: Thu, 1 Feb 2024 15:45:42 +0000
Subject: [PATCH] Update .gitlab-ci.yml

(cherry picked from commit 8c5818acf03c0116ee0c7180f1ff5e94927aa27a)
---
 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f07b4c9abe..9960be5056 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,9 @@ getImageTag:
     - tags
 buildDocker:
   stage: deploy
+  needs:
+    - job: getImageTag
+      artifacts: true
   parallel:
     matrix:
       - ARCH: amd64
@@ -71,7 +74,7 @@ buildDocker:
       /kaniko/executor
       --context "${CI_PROJECT_DIR}"
       --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-      --destination "${CI_REGISTRY_IMAGE}:${ARCH}"
+      --destination "${CI_REGISTRY_IMAGE}:${REGISTRY_PUSH_TAG}-${ARCH}"
   only:
     - stable
     - develop
@@ -96,9 +99,9 @@ mergeManifests:
       push from-args
       --platforms linux/amd64,linux/arm64
       --tags ${REGISTRY_PUSH_VERSION}
-      --template ${CI_REGISTRY_IMAGE}:ARCH
+      --template ${CI_REGISTRY_IMAGE}:${REGISTRY_PUSH_TAG}-ARCH
       --target ${CI_REGISTRY_IMAGE}:${REGISTRY_PUSH_TAG}
   only:
     - stable
     - develop
-    - tags
\ No newline at end of file
+    - tags