Merge pull request kubernetes#19948 from alex-mohr/automated-cherry-pick-of-#19847-upstream-release-1.0

alex-mohr · alex-mohr · commit b642f544a368 · 2016-01-21T17:23:01.000-08:00
Automated cherry pick of kubernetes#19847
diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
@@ -15,7 +15,7 @@
 # This file creates a standard build environment for building cross
 # platform go binary for the architecture kubernetes cares about.
 
-FROM  golang:1.4
+FROM  golang:1.4.2
 MAINTAINER  Joe Beda <jbeda@google.com>
 
 ENV KUBE_CROSSPLATFORMS \
diff --git a/build/common.sh b/build/common.sh
@@ -415,7 +415,9 @@ function kube::build::build_image() {
   kube::version::save_version_vars "${build_context_dir}/kube-version-defs"
 
   cp build/build-image/Dockerfile ${build_context_dir}/Dockerfile
-  kube::build::docker_build "${KUBE_BUILD_IMAGE}" "${build_context_dir}"
+  # We don't want to force-pull this image because it's based on a local image
+  # (see kube::build::build_image_cross), not upstream.
+  kube::build::docker_build "${KUBE_BUILD_IMAGE}" "${build_context_dir}" 'false'
 }
 
 # Build the kubernetes golang cross base image.
@@ -431,10 +433,12 @@ function kube::build::build_image_cross() {
 # Build a docker image from a Dockerfile.
 # $1 is the name of the image to build
 # $2 is the location of the "context" directory, with the Dockerfile at the root.
+# $3 is the value to set the --pull flag for docker build; true by default
 function kube::build::docker_build() {
   local -r image=$1
   local -r context_dir=$2
-  local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "${context_dir}")
+  local -r pull="${3:-true}"
+  local -ra build_cmd=("${DOCKER[@]}" build -t "${image}" "--pull=${pull}" "${context_dir}")
 
   kube::log::status "Building Docker image ${image}."
   local docker_output
