From 62e8a93c3496791e8bfb2204f68b2a1cdf61fec9 Mon Sep 17 00:00:00 2001 From: unclejack Date: Thu, 11 Dec 2014 20:53:16 +0200 Subject: [PATCH 1/3] bump Go to 1.4 Signed-off-by: Cristian Staretu --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a7b6bbc427..94666af860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From 6ac802ecd8e097f49c4b026fd7b5febfc683866c Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Thu, 18 Dec 2014 09:06:04 -0800 Subject: [PATCH 2/3] Reinstall standard library with netgo Fixes #9449 Signed-off-by: Alexander Morozov --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 94666af860..67e8d8d5a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From a31c14cadca4052a0a141347b322d825f56b814b Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Sat, 20 Dec 2014 20:09:35 -0800 Subject: [PATCH 3/3] Fix TestBuildWithTabs for go 1.4 Signed-off-by: Alexander Morozov --- integration-cli/docker_cli_build_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 0d527119cb..e440bc7705 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -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) }