From 7209c224a4a29ca04cbf36ac126ddb22d7575851 Mon Sep 17 00:00:00 2001
From: David Hiendl <david.hiendl@dhswt.de>
Date: Mon, 24 Oct 2022 18:36:52 +0200
Subject: [PATCH] drone/ContainerImageKaniko: support building multiple
 registries

---
 drone/ContainerImageKaniko.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drone/ContainerImageKaniko.yml b/drone/ContainerImageKaniko.yml
index 7e70d0a..b3efd8b 100644
--- a/drone/ContainerImageKaniko.yml
+++ b/drone/ContainerImageKaniko.yml
@@ -1,8 +1,9 @@
 
 .ContainerImageKaniko: &ContainerImageKaniko
   name: ContainerImageKaniko
-  image: gcr.io/kaniko-project/executor:debug
-  
+  #image: gcr.io/kaniko-project/executor:debug
+  image: gitea.dhswt.de/dhswt/kaniko:master
+
   environment:
     KANIKO_ARGS: ""
     TAG_PREFIX: ""
@@ -19,11 +20,11 @@
     ADDITIONAL_REGISTRIES: ""
     ADD_CI_REGISTRY_AUTH: "true"
     ADD_CI_REGISTRY_TARGET: "true"
+    ADDTIONAL_REGISTRY_AUTH_JSON: ""
 
   commands:
     - &ContainerImageKanikoCommands |
 
-    
       _OLD_IFS="$IFS"
       REGISTRY_TARGETS=""
 
@@ -50,8 +51,15 @@
 
       # add gitlab registry auth
       if [[ "$ADD_CI_REGISTRY_AUTH" == "true" ]]; then
+        GITEA_REGISTRY_AUTH_JSON="{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n token:$CI_REGISTRY_PASSWORD | base64)\"}}}"
+      fi
+
+      # create merged auth file
+      if [[ ! -z "$ADDITIONAL_REGISTRY_AUTH_JSON" ]] || [[ ! -z "$GITEA_REGISTRY_AUTH_JSON ]]; then
         mkdir -p /kaniko/.docker
-        echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n token:$CI_REGISTRY_PASSWORD | base64)\"}}}" > /kaniko/.docker/config.json
+        echo "$ADDITIONAL_REGISTRY_AUTH_JSON $GITEA_REGISTRY_AUTH_JSON" | \
+          jq --slurp 'reduce .[] as $item ({}; . * $item)' \
+          > /kaniko/.docker/config.json
       fi
 
       IMAGE_TAGS=""