Revert "Up to golang 1.5.3"

This reverts commit d26f4e1583.
This commit is contained in:
Zach Loafman 2016-02-03 11:44:30 -08:00
parent fc2929ed05
commit 54a9241605

View File

@ -15,17 +15,15 @@
# 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.5.3 FROM golang:1.4.2
# Original MAINTAINER Joe Beda <jbeda@google.com> 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
# Pre-compile the standard go library when cross-compiling. This is much easier now when we have go1.5 RUN cd /usr/src/go/src && for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean; done
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/* &&\