Browse code
Fix 'make all' for other platforms
Since commit d7e2c4ce7 ("Use gometalinter for linting") command
"make all" fails on all the non-default platforms (i.e. ARMs, PPC, and
s390) in this way:
# make all
...
Congratulations! All commits are properly signed with the DCO!
/go/src/github.com/docker/docker/hack/validate/gometalinter: line 6: gometalinter: command not found
Makefile:105: recipe for target 'all' failed
make: *** [all] Error 127
Make sure gometalinter is installed for those platforms
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Kir Kolyshkin authored on 2017/09/07 07:13:24Showing 4 changed files
| ... | ... |
@@ -173,7 +173,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 173 | 173 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 174 | 174 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 175 | 175 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 176 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 176 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 177 | 177 |
ENV PATH=/usr/local/cli:$PATH |
| 178 | 178 |
|
| 179 | 179 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| ... | ... |
@@ -162,7 +162,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 162 | 162 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 163 | 163 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 164 | 164 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 165 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 165 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 166 | 166 |
ENV PATH=/usr/local/cli:$PATH |
| 167 | 167 |
|
| 168 | 168 |
ENTRYPOINT ["hack/dind"] |
| ... | ... |
@@ -160,7 +160,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 160 | 160 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 161 | 161 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 162 | 162 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 163 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 163 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 164 | 164 |
ENV PATH=/usr/local/cli:$PATH |
| 165 | 165 |
|
| 166 | 166 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| ... | ... |
@@ -153,7 +153,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 153 | 153 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 154 | 154 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 155 | 155 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 156 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 156 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 157 | 157 |
ENV PATH=/usr/local/cli:$PATH |
| 158 | 158 |
|
| 159 | 159 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |