Browse code
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 <lk4d4@docker.com>
Alexander Morozov authored on 2016/08/24 01:01:28Showing 4 changed files
| ... | ... |
@@ -134,18 +134,11 @@ ENV DOCKER_CROSSPLATFORMS \ |
| 134 | 134 |
freebsd/amd64 freebsd/386 freebsd/arm \ |
| 135 | 135 |
windows/amd64 windows/386 |
| 136 | 136 |
|
| 137 |
-# This has been commented out and kept as reference because we don't support compiling with older Go anymore. |
|
| 138 |
-# ENV GOFMT_VERSION 1.3.3 |
|
| 139 |
-# 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
|
|
| 140 |
- |
|
| 137 |
+# Dependency for golint |
|
| 141 | 138 |
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 |
| 142 |
-# Grab Go's cover tool for dead-simple code coverage testing |
|
| 143 |
-# Grab Go's vet tool for examining go code to find suspicious constructs |
|
| 144 |
-# and help prevent errors that the compiler might not catch |
|
| 145 | 139 |
RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ |
| 146 |
- && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ |
|
| 147 |
- && go install -v golang.org/x/tools/cmd/cover \ |
|
| 148 |
- && go install -v golang.org/x/tools/cmd/vet |
|
| 140 |
+ && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) |
|
| 141 |
+ |
|
| 149 | 142 |
# Grab Go's lint tool |
| 150 | 143 |
ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 |
| 151 | 144 |
RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ |
| ... | ... |
@@ -75,18 +75,11 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor |
| 75 | 75 |
ENV GOARCH arm |
| 76 | 76 |
ENV GOARM 7 |
| 77 | 77 |
|
| 78 |
-# This has been commented out and kept as reference because we don't support compiling with older Go anymore. |
|
| 79 |
-# ENV GOFMT_VERSION 1.3.3 |
|
| 80 |
-# 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
|
|
| 81 |
- |
|
| 78 |
+# Dependency for golint |
|
| 82 | 79 |
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 |
| 83 |
-# Grab Go's cover tool for dead-simple code coverage testing |
|
| 84 |
-# Grab Go's vet tool for examining go code to find suspicious constructs |
|
| 85 |
-# and help prevent errors that the compiler might not catch |
|
| 86 | 80 |
RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ |
| 87 |
- && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ |
|
| 88 |
- && go install -v golang.org/x/tools/cmd/cover \ |
|
| 89 |
- && go install -v golang.org/x/tools/cmd/vet |
|
| 81 |
+ && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) |
|
| 82 |
+ |
|
| 90 | 83 |
# Grab Go's lint tool |
| 91 | 84 |
ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 |
| 92 | 85 |
RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ |
| ... | ... |
@@ -103,18 +103,11 @@ ENV GOROOT_BOOTSTRAP /usr/src/ |
| 103 | 103 |
ENV PATH /usr/src/go/bin/:/go/bin:$PATH |
| 104 | 104 |
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor |
| 105 | 105 |
|
| 106 |
-# This has been commented out and kept as reference because we don't support compiling with older Go anymore. |
|
| 107 |
-# ENV GOFMT_VERSION 1.3.3 |
|
| 108 |
-# 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
|
|
| 109 |
- |
|
| 106 |
+# Dependency for golint |
|
| 110 | 107 |
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 |
| 111 |
-# Grab Go's cover tool for dead-simple code coverage testing |
|
| 112 |
-# Grab Go's vet tool for examining go code to find suspicious constructs |
|
| 113 |
-# and help prevent errors that the compiler might not catch |
|
| 114 | 108 |
RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ |
| 115 |
- && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ |
|
| 116 |
- && go install -v golang.org/x/tools/cmd/cover \ |
|
| 117 |
- && go install -v golang.org/x/tools/cmd/vet |
|
| 109 |
+ && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) |
|
| 110 |
+ |
|
| 118 | 111 |
# Grab Go's lint tool |
| 119 | 112 |
ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 |
| 120 | 113 |
RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ |
| ... | ... |
@@ -111,18 +111,11 @@ ENV GOROOT_BOOTSTRAP /usr/src/ |
| 111 | 111 |
ENV PATH /usr/src/go/bin/:/go/bin:$PATH |
| 112 | 112 |
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor |
| 113 | 113 |
|
| 114 |
-# This has been commented out and kept as reference because we don't support compiling with older Go anymore. |
|
| 115 |
-# ENV GOFMT_VERSION 1.3.3 |
|
| 116 |
-# 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
|
|
| 117 |
- |
|
| 114 |
+# Dependency for golint |
|
| 118 | 115 |
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 |
| 119 |
-# Grab Go's cover tool for dead-simple code coverage testing |
|
| 120 |
-# Grab Go's vet tool for examining go code to find suspicious constructs |
|
| 121 |
-# and help prevent errors that the compiler might not catch |
|
| 122 | 116 |
RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ |
| 123 |
- && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ |
|
| 124 |
- && go install -v golang.org/x/tools/cmd/cover \ |
|
| 125 |
- && go install -v golang.org/x/tools/cmd/vet |
|
| 117 |
+ && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) |
|
| 118 |
+ |
|
| 126 | 119 |
# Grab Go's lint tool |
| 127 | 120 |
ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 |
| 128 | 121 |
RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ |