From d26f4e15839a23b3350ffaa0575995ee81ddda50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Fri, 22 Jan 2016 08:21:52 +0200 Subject: [PATCH] Up to golang 1.5.3 --- build/build-image/cross/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index f8aff81ca8..19368e695b 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -15,15 +15,17 @@ # This file creates a standard build environment for building cross # platform go binary for the architecture kubernetes cares about. -FROM golang:1.4.2 -MAINTAINER Joe Beda +FROM golang:1.5.3 +# Original MAINTAINER Joe Beda +MAINTAINER Brendan Burns ENV KUBE_CROSSPLATFORMS \ linux/386 linux/arm \ 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 install -y g++ && apt-get clean && rm -rf /var/lib/apt/lists/* &&\