From 08c16f8abfdc1f91119a35056c92d131b815fbf8 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 23 Aug 2016 09:01:28 -0700 Subject: [PATCH] Dockerfile: do not install vet and cover They're included in go since 1.5. Also I've removed comment about ancient gofmt version. Signed-off-by: Alexander Morozov --- Dockerfile | 13 +++---------- Dockerfile.armhf | 13 +++---------- Dockerfile.ppc64le | 13 +++---------- Dockerfile.s390x | 13 +++---------- 4 files changed, 12 insertions(+), 40 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a3fe89a23..78975e9e64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -134,18 +134,11 @@ ENV DOCKER_CROSSPLATFORMS \ freebsd/amd64 freebsd/386 freebsd/arm \ windows/amd64 windows/386 -# This has been commented out and kept as reference because we don't support compiling with older Go anymore. -# ENV GOFMT_VERSION 1.3.3 -# RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt - +# Dependency for golint ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 -# Grab Go's cover tool for dead-simple code coverage testing -# Grab Go's vet tool for examining go code to find suspicious constructs -# and help prevent errors that the compiler might not catch RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ - && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ - && go install -v golang.org/x/tools/cmd/cover \ - && go install -v golang.org/x/tools/cmd/vet + && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) + # Grab Go's lint tool ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5ff38a6de9..ae61eab74c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -75,18 +75,11 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor ENV GOARCH arm ENV GOARM 7 -# This has been commented out and kept as reference because we don't support compiling with older Go anymore. -# ENV GOFMT_VERSION 1.3.3 -# RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt - +# Dependency for golint ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 -# Grab Go's cover tool for dead-simple code coverage testing -# Grab Go's vet tool for examining go code to find suspicious constructs -# and help prevent errors that the compiler might not catch RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ - && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ - && go install -v golang.org/x/tools/cmd/cover \ - && go install -v golang.org/x/tools/cmd/vet + && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) + # Grab Go's lint tool ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 58b5b5b2a8..74885bf988 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -103,18 +103,11 @@ ENV GOROOT_BOOTSTRAP /usr/src/ ENV PATH /usr/src/go/bin/:/go/bin:$PATH ENV GOPATH /go:/go/src/github.com/docker/docker/vendor -# This has been commented out and kept as reference because we don't support compiling with older Go anymore. -# ENV GOFMT_VERSION 1.3.3 -# RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt - +# Dependency for golint ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 -# Grab Go's cover tool for dead-simple code coverage testing -# Grab Go's vet tool for examining go code to find suspicious constructs -# and help prevent errors that the compiler might not catch RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ - && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ - && go install -v golang.org/x/tools/cmd/cover \ - && go install -v golang.org/x/tools/cmd/vet + && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) + # Grab Go's lint tool ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index e195423865..8a11a1da45 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -111,18 +111,11 @@ ENV GOROOT_BOOTSTRAP /usr/src/ ENV PATH /usr/src/go/bin/:/go/bin:$PATH ENV GOPATH /go:/go/src/github.com/docker/docker/vendor -# This has been commented out and kept as reference because we don't support compiling with older Go anymore. -# ENV GOFMT_VERSION 1.3.3 -# RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt - +# Dependency for golint ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 -# Grab Go's cover tool for dead-simple code coverage testing -# Grab Go's vet tool for examining go code to find suspicious constructs -# and help prevent errors that the compiler might not catch RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ - && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ - && go install -v golang.org/x/tools/cmd/cover \ - && go install -v golang.org/x/tools/cmd/vet + && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) + # Grab Go's lint tool ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \