Merge pull request #20577 from zmerlynn/revert-19985

build/build-image/cross/Dockerfile

@@ -15,17 +15,15 @@
 # This file creates a standard build environment for building cross
 # platform go binary for the architecture kubernetes cares about.
 
-FROM  golang:1.5.3
-# Original MAINTAINER  Joe Beda <jbeda@google.com>
-MAINTAINER Brendan Burns <bburns@google.com>
+FROM  golang:1.4.2
+MAINTAINER  Joe Beda <jbeda@google.com>
 
 ENV KUBE_CROSSPLATFORMS \
   linux/386 linux/arm \
   darwin/amd64 darwin/386 \
   windows/amd64 windows/386
 
-# Pre-compile the standard go library when cross-compiling. This is much easier now when we have go1.5
-RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${platform##*/} go install std; done
+RUN cd /usr/src/go/src && for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean; done
 
 # Install g++, then download and install protoc for generating protobuf output
 RUN apt-get install -y g++ && apt-get clean && rm -rf /var/lib/apt/lists/* &&\

build/common.sh

@@ -48,7 +48,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
 
 # Constants
 readonly KUBE_BUILD_IMAGE_REPO=kube-build
-readonly KUBE_BUILD_GOLANG_VERSION=1.5.3
+readonly KUBE_BUILD_GOLANG_VERSION=1.4.2
 readonly KUBE_BUILD_IMAGE_CROSS_TAG="cross-${KUBE_BUILD_GOLANG_VERSION}-1"
 readonly KUBE_BUILD_IMAGE_CROSS="${KUBE_BUILD_IMAGE_REPO}:${KUBE_BUILD_IMAGE_CROSS_TAG}"
 # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>