Accept OS_BUILD_IMAGE_ARGS in our image build scripts

Allows a set of arguments to be passed to the image builder

Author: smarterclayton

Makefile

@@ -13,7 +13,12 @@ OS_OUTPUT_GOPATH ?= 1
 
 export GOFLAGS
 export TESTFLAGS
+# If set to 1, create an isolated GOPATH inside _output using symlinks to avoid
+# other packages being accidentally included. Defaults to on.
 export OS_OUTPUT_GOPATH
+# May be used to set additional arguments passed to the image build commands for
+# mounting secrets specific to a build environment.
+export OS_BUILD_IMAGE_ARGS
 
 # Build code.
 #

hack/build-base-images.sh

@@ -24,7 +24,7 @@ if [[ -z "${oc}" ]]; then
 fi
 
 function build() {
-  "${oc}" ex dockerbuild $2 $1
+  eval "'${oc}'' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"
 }
 
 # Build the images

hack/build-images.sh

@@ -61,7 +61,7 @@ if [[ -z "${oc}" ]]; then
 fi
 
 function build() {
-  "${oc}" ex dockerbuild $2 $1
+  eval "'${oc}'' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"
 }
 
 # Create link to file if the FS supports hardlinks, otherwise copy the file