From 54a9241605018770f94a9815daa5c51da74925f5 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 3 Feb 2016 11:44:30 -0800 Subject: [PATCH 1/2] Revert "Up to golang 1.5.3" This reverts commit d26f4e15839a23b3350ffaa0575995ee81ddda50. --- build/build-image/cross/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 19368e695bd..f8aff81ca8f 100644 --- a/build/build-image/cross/Dockerfile +++ b/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 -MAINTAINER Brendan Burns +FROM golang:1.4.2 +MAINTAINER Joe Beda 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/* &&\ From e87b93f1b8f48998ee449bde6cd5c58db1f3bd18 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 3 Feb 2016 11:46:03 -0800 Subject: [PATCH 2/2] KUBE_BUILD_GOLANG_VERSION=1.4.2 --- build/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.sh b/build/common.sh index b653ea298cd..ed8a9cb10df 100755 --- a/build/common.sh +++ b/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-