github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19985 from luxas/onedotfive 

Up to golang 1.5.3
pull/6/head
Zach Loafman 2016-01-22 07:21:06 -08:00
parent a5f4f3b301 d26f4e1583
commit ef77ce7147
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/build-image/cross/Dockerfile
View File

@ -15,15 +15,17 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.4.2 FROM golang:1.5.3
MAINTAINER Joe Beda <jbeda@google.com> # Original MAINTAINER Joe Beda <jbeda@google.com>
MAINTAINER Brendan Burns <bburns@google.com>
ENV KUBE_CROSSPLATFORMS \ ENV KUBE_CROSSPLATFORMS \
linux/386 linux/arm \ linux/386 linux/arm \
darwin/amd64 darwin/386 \ darwin/amd64 darwin/386 \
windows/amd64 windows/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 # 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/* &&\ RUN apt-get install -y g++ && apt-get clean && rm -rf /var/lib/apt/lists/* &&\