go 1.6.0

Author: rsc

build/build-image/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This file creates a standard build environment for building Kubernetes
-FROM gcr.io/google_containers/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
+FROM gcr.io/groovy-sentry-504/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
 
 # Mark this as a kube-build container
 RUN touch /kube-build-image

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.2
+FROM  golang:1.6.0
 
 ENV GOARM 6
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
@@ -27,8 +27,8 @@ ENV KUBE_CROSSPLATFORMS \
   darwin/amd64 darwin/386 \
   windows/amd64 windows/386
 
-RUN cd /usr/src/go/src \
-  && for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean; done
+# 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
 
 # Install g++, then download and install protoc for generating protobuf output
 RUN apt-get update \

build/build-image/cross/Makefile

@@ -18,9 +18,9 @@ IMAGE = kube-cross
 TAG = $(shell cat VERSION)
 
 build:
-	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
+	docker build -t gcr.io/groovy-sentry-504/$(IMAGE):$(TAG) .
 
 push:	build
-	gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG)
+	gcloud docker --server=gcr.io push gcr.io/groovy-sentry-504/$(IMAGE):$(TAG)
 
 all:	push

build/build-image/cross/VERSION

@@ -1 +1 @@
-v1.4.2-1
+v1.6.0-1

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_IMAGE_CROSS_TAG="v1.4.2-1"
+readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.0-1"
 # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
 
 # Here we map the output directories across both the local and remote _output