Browse code
Dockerfile: remove GOMETALINTER_OPTS
This `ENV` was added to the Dockerfile in b96093fa56a9c085cb3123010be2430753c40cbc,
when the repository used per-architecture Dockerfiles, and some architectures needed
a different configuration.
Now that we use a multi-arch Dockerfile, and CI uses a Jenkinsfile, we can remove
this `ENV` from the Dockerfile, and set it in CI instead if needed.
Also updated the wording and fixed linting issues in hack/validate/gometalinter
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a464a3d51f89566b3e480d66903056004576cc85)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/09/11 15:51:06Showing 2 changed files
| ... | ... |
@@ -281,8 +281,6 @@ COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c98 |
| 281 | 281 |
|
| 282 | 282 |
ENV PATH=/usr/local/cli:$PATH |
| 283 | 283 |
ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
| 284 |
-# Options for hack/validate/gometalinter |
|
| 285 |
-ENV GOMETALINTER_OPTS="--deadline=2m" |
|
| 286 | 284 |
WORKDIR /go/src/github.com/docker/docker |
| 287 | 285 |
VOLUME /var/lib/docker |
| 288 | 286 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| ... | ... |
@@ -4,10 +4,11 @@ set -e -o pipefail |
| 4 | 4 |
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
| 5 | 5 |
|
| 6 | 6 |
# CI platforms differ, so per-platform GOMETALINTER_OPTS can be set |
| 7 |
-# from a platform-specific Dockerfile, otherwise let's just set |
|
| 7 |
+# in the Jenkinsfile, otherwise let's just set a |
|
| 8 | 8 |
# (somewhat pessimistic) default of 10 minutes. |
| 9 |
-: ${GOMETALINTER_OPTS=--deadline=10m}
|
|
| 9 |
+: "${GOMETALINTER_OPTS=--deadline=10m}"
|
|
| 10 | 10 |
|
| 11 |
+# shellcheck disable=SC2086 |
|
| 11 | 12 |
gometalinter \ |
| 12 | 13 |
${GOMETALINTER_OPTS} \
|
| 13 |
- --config ${SCRIPTDIR}/gometalinter.json ./...
|
|
| 14 |
+ --config "${SCRIPTDIR}/gometalinter.json" ./...
|