Dockerfile: remove GOMETALINTER_OPTS

thaJeztah · thaJeztah · commit 06cca53fa0d6 · 2019-09-25T21:36:12.000+02:00
This `ENV` was added to the Dockerfile in b96093f, 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 a464a3d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/Dockerfile b/Dockerfile
@@ -281,8 +281,6 @@ COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c98
 
 ENV PATH=/usr/local/cli:$PATH
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux
-# Options for hack/validate/gometalinter
-ENV GOMETALINTER_OPTS="--deadline=2m"
 WORKDIR /go/src/github.com/docker/docker
 VOLUME /var/lib/docker
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
diff --git a/hack/validate/gometalinter b/hack/validate/gometalinter
@@ -4,10 +4,11 @@ set -e -o pipefail
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # CI platforms differ, so per-platform GOMETALINTER_OPTS can be set
-# from a platform-specific Dockerfile, otherwise let's just set
+# in the Jenkinsfile, otherwise let's just set a
 # (somewhat pessimistic) default of 10 minutes.
-: ${GOMETALINTER_OPTS=--deadline=10m}
+: "${GOMETALINTER_OPTS=--deadline=10m}"
 
+# shellcheck disable=SC2086
 gometalinter \
 	${GOMETALINTER_OPTS} \
-	--config ${SCRIPTDIR}/gometalinter.json ./...
+	--config "${SCRIPTDIR}/gometalinter.json" ./...
