Merge pull request #13467 from smarterclayton/deps

Carry patch to docker/docker in pkg/build/vendor that allows compilation against our version

hack/build-cross.sh

@@ -50,46 +50,46 @@ if [[ -n "${OS_ONLY_BUILD_PLATFORMS-}" ]]; then
       filtered+=("${platform}")
     fi
   done
-  platforms=("${filtered[@]}")
+  platforms=("${filtered[@]+"${filtered[@]}"}")
 
   filtered=( )
   for platform in ${image_platforms[@]}; do
     if [[ "${platform}" =~ "${OS_ONLY_BUILD_PLATFORMS}" ]]; then
       filtered+=("${platform}")
     fi
   done
-  image_platforms=("${filtered[@]}")
+  image_platforms=("${filtered[@]+"${filtered[@]}"}")
 
   filtered=( )
   for platform in ${test_platforms[@]}; do
     if [[ "${platform}" =~ "${OS_ONLY_BUILD_PLATFORMS}" ]]; then
       filtered+=("${platform}")
     fi
   done
-  test_platforms=("${filtered[@]}")
+  test_platforms=("${filtered[@]+"${filtered[@]}"}")
 fi
 
 # Build image binaries for a subset of platforms. Image binaries are currently
 # linux-only, and are compiled with flags to make them static for use in Docker
 # images "FROM scratch".
-OS_BUILD_PLATFORMS=("${image_platforms[@]}")
+OS_BUILD_PLATFORMS=("${image_platforms[@]+"${image_platforms[@]}"}")
 os::build::build_static_binaries "${OS_IMAGE_COMPILE_TARGETS_LINUX[@]-}" "${OS_SCRATCH_IMAGE_COMPILE_TARGETS_LINUX[@]-}"
 
 # Build the primary client/server for all platforms
-OS_BUILD_PLATFORMS=("${platforms[@]}")
+OS_BUILD_PLATFORMS=("${platforms[@]+"${platforms[@]}"}")
 os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}"
 
 # Build the test binaries for the host platform
-OS_BUILD_PLATFORMS=("${test_platforms[@]}")
+OS_BUILD_PLATFORMS=("${test_platforms[@]+"${test_platforms[@]}"}")
 os::build::build_binaries "${OS_TEST_TARGETS[@]}"
 
 # Make the primary client/server release.
-OS_BUILD_PLATFORMS=("${platforms[@]}")
+OS_BUILD_PLATFORMS=("${platforms[@]+"${platforms[@]}"}")
 OS_RELEASE_ARCHIVE="openshift-origin" \
   os::build::place_bins "${OS_CROSS_COMPILE_BINARIES[@]}"
 
 # Make the image binaries release.
-OS_BUILD_PLATFORMS=("${image_platforms[@]}")
+OS_BUILD_PLATFORMS=("${image_platforms[@]+"${image_platforms[@]}"}")
 OS_RELEASE_ARCHIVE="openshift-origin-image" \
   os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
 

hack/common.sh

@@ -217,7 +217,7 @@ os::build::internal::build_binaries() {
 
     local host_platform=$(os::build::host_platform)
     local platform
-    for platform in "${platforms[@]}"; do
+    for platform in "${platforms[@]+"${platforms[@]}"}"; do
       echo "++ Building go targets for ${platform}:" "${targets[@]}"
       mkdir -p "${OS_OUTPUT_BINPATH}/${platform}"
 
@@ -306,7 +306,7 @@ function os::build::place_bins() {
     fi
 
     os::build::export_targets "$@"
-    for platform in "${platforms[@]}"; do
+    for platform in "${platforms[@]+"${platforms[@]}"}"; do
       # The substitution on platform_src below will replace all slashes with
       # underscores.  It'll transform darwin/amd64 -> darwin_amd64.
       local platform_src="/${platform//\//_}"