From 4d440889ff0dfc9dc045b7361a2c7fc7a62eeccf Mon Sep 17 00:00:00 2001
From: Joseph Goergen <Joseph.Goergen@ibm.com>
Date: Mon, 1 Mar 2021 13:14:40 -0600
Subject: [PATCH] Fixed the Dockerfile for the build-image to build from
 KUBE_BASE_IMAGE_REGISTRY

related: https://github.ibm.com/alchemy-containers/armada-update/issues/1791
---
 build/build-image/Dockerfile | 3 ++-
 build/common.sh              | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index 0fcaa860e46..0f66049a3e9 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -14,8 +14,9 @@
 
 # This file creates a standard build environment for building Kubernetes
 ARG KUBE_BUILD_IMAGE_CROSS_TAG
+ARG KUBE_BASE_IMAGE_REGISTRY
 
-FROM k8s.gcr.io/build-image/kube-cross:${KUBE_BUILD_IMAGE_CROSS_TAG}
+FROM ${KUBE_BASE_IMAGE_REGISTRY}/kube-cross:${KUBE_BUILD_IMAGE_CROSS_TAG}
 
 # Mark this as a kube-build container
 RUN touch /kube-build-image
diff --git a/build/common.sh b/build/common.sh
index 28ca64a0fe1..442177938d4 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -372,7 +372,7 @@ function kube::build::build_image() {
   dd if=/dev/urandom bs=512 count=1 2>/dev/null | LC_ALL=C tr -dc 'A-Za-z0-9' | dd bs=32 count=1 2>/dev/null > "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
   chmod go= "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
 
-  kube::build::docker_build "${KUBE_BUILD_IMAGE}" "${LOCAL_OUTPUT_BUILD_CONTEXT}" 'false' "--build-arg=KUBE_BUILD_IMAGE_CROSS_TAG=${KUBE_BUILD_IMAGE_CROSS_TAG}"
+  kube::build::docker_build "${KUBE_BUILD_IMAGE}" "${LOCAL_OUTPUT_BUILD_CONTEXT}" 'false' "--build-arg=KUBE_BUILD_IMAGE_CROSS_TAG=${KUBE_BUILD_IMAGE_CROSS_TAG} --build-arg=KUBE_BASE_IMAGE_REGISTRY=${KUBE_BASE_IMAGE_REGISTRY}"
 
   # Clean up old versions of everything
   kube::build::docker_delete_old_containers "${KUBE_BUILD_CONTAINER_NAME_BASE}" "${KUBE_BUILD_CONTAINER_NAME}"
@@ -393,8 +393,10 @@ function kube::build::docker_build() {
   local -r image=$1
   local -r context_dir=$2
   local -r pull="${3:-true}"
-  local -r build_args=$4
-  local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "--pull=${pull}" "${build_args}" "${context_dir}")
+  local build_args
+  IFS=" " read -r -a build_args <<< "$4"
+  readonly build_args
+  local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "--pull=${pull}" "${build_args[@]}" "${context_dir}")
 
   kube::log::status "Building Docker image ${image}"
   local docker_output