kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #9615 from unclejack/bump_go_to_1.4

Browse source 
bump Go to 1.4
This commit is contained in:
Jessie Frazelle 2014-12-22 15:07:57 -08:00
commit d09421a74f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -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
# 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 GOPATH /go:/go/src/github.com/docker/docker/vendor
ENV PATH /go/bin:$PATH
@ -78,6 +78,9 @@ ENV DOCKER_CROSSPLATFORMS \
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'
# 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
RUN go get golang.org/x/tools/cmd/cover

2
integration-cli/docker_cli_build_test.go
View file

@ -3925,7 +3925,7 @@ func TestBuildWithTabs(t *testing.T) {
if err != nil {
t.Fatal(err)
}
expected := "[\"/bin/sh\",\"-c\",\"echo\\u0009one\\u0009\\u0009two\"]"
expected := `["/bin/sh","-c","echo\tone\t\ttwo"]`
if res != expected {
t.Fatalf("Missing tabs.\nGot:%s\nExp:%s", res, expected)
}