From 4b7f7666f28b2cf7f90ca940945df4cd256a3a87 Mon Sep 17 00:00:00 2001
From: Saya Andy <montferrat@tuta.io>
Date: Wed, 29 Jul 2026 17:10:14 +0700
Subject: fix: generate docker config correctly in stitch credentials job

---
 Jenkinsfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bbf8f09..c386e7d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,6 +42,8 @@ kind: Pod
 metadata:
   namespace: jenkins
 spec:
+  nodeSelector:
+    kubernetes.io/arch: ${GOARCH}
   containers:
     - name: kaniko
       image: gcr.io/kaniko-project/executor:v1.24.0-debug
@@ -124,13 +126,12 @@ spec:
             steps {
                 script {
                     env.GIT_COMMIT_SHORT = env.GIT_COMMIT ? env.GIT_COMMIT.take(7) : "unknown"
+                }
+                withCredentials([string(credentialsId: 'registry-sayagit-jenkins-password', variable: 'REGISTRY_SAYAGIT_JENKINS_PASSWORD')]) {
                     sh '''#!/busybox/sh
-                        mkdir -p /kaniko/.docker
-                        printf '{"auths":{"registry.sayag.it":{"username":"jenkins","password":"%s"}}}' "$REGISTRY_SAYAGIT_JENKINS_PASSWORD" > /kaniko/.docker/config.json
-                        pushToTags="$IMAGE_PUSH_DESTINATION:commit-$GIT_COMMIT_SHORT-$GOARCH"
-                        if [ "$TAG_NAME" != "" ]; then
-                            pushToTags="$pushToTags $IMAGE_PUSH_DESTINATION:$TAG_NAME-$GOARCH"
-                        fi
+                        mkdir -p /root/.docker
+                        printf '{"auths":{"registry.sayag.it":{"username":"jenkins","password":"%s"}}}' "$REGISTRY_SAYAGIT_JENKINS_PASSWORD" > /root/.docker/config.json
+
                         manifest-tool push from-args \
                             --platforms linux/amd64,linux/arm64 \
                             --template $IMAGE_PUSH_DESTINATION:commit-$GIT_COMMIT_SHORT-ARCH \
-- 
cgit v1.3.1+13