Simplified.

Author: mihxil

kaniko.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 # This script calls kaniko (in docker) for the current directory. You can put it in your path
 # It's actually calling the scripts/script.sh in ghcr.io/npo-poms/kaniko
+DOCKER_CONFIG=${DOCKER_CONFIG:-config-gitlab.json}
+DOCKER_AUTH_CONFIG=${DOCKER_AUTH_CONFIG:-/root/.docker/${DOCKER_CONFIG}}
 
 $(dirname "${BASH_SOURCE[0]}")/local-setup.sh
 cat job.env
 
-#KANIKO_IMAGE=npo-poms/kaniko
-KANIKO_IMAGE=ghcr.io/npo-poms/kaniko:5
+KANIKO_IMAGE=npo-poms/kaniko
+#KANIKO_IMAGE=ghcr.io/npo-poms/kaniko:5
 
 docker run -v ~/conf:/root/conf -v ~/.docker:/root/.docker -v "$(pwd)":/workspace \
     -e PROJECT_VERSION="$PROJECT_VERSION" \
     -e IMAGE_TAG=${IMAGE_TAG} \
     -e NAMESPACE=${NAMESPACE} \
     -e REGISTRY="${REGISTRY}" \
-    -e DOCKER_AUTH_CONFIG="/root/.docker/config-gitlab.json" \
+    -e DOCKER_AUTH_CONFIG="${DOCKER_AUTH_CONFIG} \
     -e CI_COMMIT_REF_NAME="${CI_COMMIT_REF_NAME}" \
     -e CI_COMMIT_SHA="$(git show --format="%H"  --no-patch)" \
     -e CI_COMMIT_TIMESTAMP="$(git show --format="%aI"  --no-patch)" \

scripts/script.sh

@@ -27,11 +27,12 @@ fi
 fun=$1
 if [ "$fun" = "help" ] ;then
   echo usage
-  echo $0      Default 'package_all_docker' to deploy all found docker deployables
+  echo $0      Default 'run_kaniko_all' to deploy all found docker deployables
   echo         or if OS_APPLICATIONS is defined in all the subdirectories it
   exit
 fi
 if [ -z "$fun" ] ; then
-  fun="package_all_docker"
+  fun="run_kaniko_all"
 fi
+echo "Calling $fun"
 $fun .