The function seems to be duplicate.

Author: mihxil

scripts/dockerfile-functions.sh

@@ -1,6 +1,9 @@
 ##!/bin/sh
 echo "docker build setup"
 
+REGISTRY="${REGISTRY:-registry.npohosting.nl}"
+NAMESPACE=${NAMESPACE:-poms}
+
 TXT_HI="\e[93m" && TXT_CLEAR="\e[0m"
 
 # scripts around the 'os_app_name' function, that determin the artifact name using information from Dockerfil
@@ -65,24 +68,4 @@ get_artifact_versions() {
   echo "Using image artifact: \"$IMAGE\" (tag: \"$IMAGE_TAG\", full: \"$FULL_IMAGE_NAME\")"
 }
 
-echo "Define determine_image_version"
-determine_image_version() {
-  if [ "$IMAGE_TAG" = '' ] ; then
-      echo "No IMAGE_TAG defined. Breaking build. This must be defined in job rule!"
-      exit 1
-  fi
-  if [ "$IMAGE_NAME" = '' ] ; then
-     echo "No IMAGE_NAME defined. Taking from os_app_name"
-     IMAGE_NAME=$(os_app_name)
-     export IMAGE_NAME
-  fi
-  # used by plain docker builds
-  if [ "$AS_LATEST" = 'true' ] ; then
-    export LATEST="--destination $REGISTRY/$IMAGE_NAME"
-  else
-    export LATEST=
-  fi
-  export IMAGE=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
-  echo "IMAGE: $IMAGE"
-}
 

scripts/kaniko-functions.sh

@@ -1,8 +1,8 @@
 ##!/bin/sh
 KANIKO_ARGS=${KANIKO_ARGS:-'--cache=true --cache-copy-layers=true'}
-REGISTRY="${REGISTRY:-registry.npohosting.nl}"
-NAMESPACE=${NAMESPACE:-poms}
+
 DOCKER_BUILD_ARGS=${DOCKER_BUILD_ARGS:-}  # Uses eval, when overriding escape whitespace: '--build-arg\ "FOO=BAR"'
+AS_LATEST=${AS_LATEST:-'false'}
 
 
 if ! type os_app_name &> /dev/null; then
@@ -68,6 +68,12 @@ kaniko_execute() {
   if [ ! -f "/kaniko/executor" ] ; then
     echo "kaniko/executor not found"
     return 1
+  fi
+   # used by plain docker builds
+  if [ "$AS_LATEST" = 'true' ] ; then
+    export LATEST="--destination $REGISTRY/$FULL_IMAGE_NAME"
+  else
+    export LATEST=
   fi
   echo Cache $REGISTRY/$NAMESPACE/caches
   /kaniko/executor $KANIKO_ARGS \
@@ -85,3 +91,4 @@ kaniko_execute() {
     --destination $image\
     --cleanup
 }
+

scripts/kaniko-gitlab-functions.sh

@@ -8,7 +8,6 @@
 
 echo "kaniko gitlab functions"
 
-AS_LATEST=${AS_LATEST:-'false'}
 
 if [ -f job.env ] ; then
   echo "Found job.env!"