|
@@ -61,7 +61,7 @@ RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper
|
|
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
|
|
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
|
|
|
|
|
|
# Install Go
|
|
# Install Go
|
|
-RUN curl -sSL https://golang.org/dl/go1.3.3.src.tar.gz | tar -v -C /usr/local -xz
|
|
|
|
|
|
+RUN curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz
|
|
ENV PATH /usr/local/go/bin:$PATH
|
|
ENV PATH /usr/local/go/bin:$PATH
|
|
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
|
|
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
|
|
ENV PATH /go/bin:$PATH
|
|
ENV PATH /go/bin:$PATH
|
|
@@ -78,6 +78,9 @@ ENV DOCKER_CROSSPLATFORMS \
|
|
ENV GOARM 5
|
|
ENV GOARM 5
|
|
RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
|
|
RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
|
|
|
|
|
|
|
|
+# reinstall standard library with netgo
|
|
|
|
+RUN go clean -i net && go install -tags netgo std
|
|
|
|
+
|
|
# Grab Go's cover tool for dead-simple code coverage testing
|
|
# Grab Go's cover tool for dead-simple code coverage testing
|
|
RUN go get golang.org/x/tools/cmd/cover
|
|
RUN go get golang.org/x/tools/cmd/cover
|
|
|
|
|