From cd6c81a6fb09f79951eed6489b0c5d1463d2e058 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 16 Jan 2018 14:33:06 -0800
Subject: [PATCH] gometalinter: fix --deadline option

1. Add = between the option and the argument, otherwise the argument
   appears to be passed on to the linters directly, as in:

> DEBUG: [golint.8]: executing /home/kir/go/bin/golint
> -min_confidence 0.800000 ./10m ./api ./api/errdefs <...>

2. Fix setting the default for GOMETALINTER_OPTS -- the default
   was -deadline (rather than --deadline).

Fixes: b96093fa56a9 ("gometalinter: add per-platform configurable options")

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: c11508a5f405084da13c35ee7ab62f1670e4da39
Component: engine
---
 components/engine/Dockerfile                 | 2 +-
 components/engine/Dockerfile.aarch64         | 2 +-
 components/engine/Dockerfile.armhf           | 2 +-
 components/engine/hack/validate/gometalinter | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
index 2a8f9181e6..c428761033 100644
--- a/components/engine/Dockerfile
+++ b/components/engine/Dockerfile
@@ -190,7 +190,7 @@ RUN ln -s /usr/local/completion/bash/docker /etc/bash_completion.d/docker
 ENTRYPOINT ["hack/dind"]
 
 # Options for hack/validate/gometalinter
-ENV GOMETALINTER_OPTS="--deadline 2m"
+ENV GOMETALINTER_OPTS="--deadline=2m"
 
 # Upload docker source
 COPY . /go/src/github.com/docker/docker
diff --git a/components/engine/Dockerfile.aarch64 b/components/engine/Dockerfile.aarch64
index fde0c706fb..4302a5e1a4 100644
--- a/components/engine/Dockerfile.aarch64
+++ b/components/engine/Dockerfile.aarch64
@@ -159,7 +159,7 @@ ENV PATH=/usr/local/cli:$PATH
 ENTRYPOINT ["hack/dind"]
 
 # Options for hack/validate/gometalinter
-ENV GOMETALINTER_OPTS="--deadline 4m -j2"
+ENV GOMETALINTER_OPTS="--deadline=4m -j2"
 
 # Upload docker source
 COPY . /go/src/github.com/docker/docker
diff --git a/components/engine/Dockerfile.armhf b/components/engine/Dockerfile.armhf
index b5a4d938a4..f489a6cde2 100644
--- a/components/engine/Dockerfile.armhf
+++ b/components/engine/Dockerfile.armhf
@@ -147,7 +147,7 @@ ENV PATH=/usr/local/cli:$PATH
 ENTRYPOINT ["hack/dind"]
 
 # Options for hack/validate/gometalinter
-ENV GOMETALINTER_OPTS="--deadline 10m -j2"
+ENV GOMETALINTER_OPTS="--deadline=10m -j2"
 
 # Upload docker source
 COPY . /go/src/github.com/docker/docker
diff --git a/components/engine/hack/validate/gometalinter b/components/engine/hack/validate/gometalinter
index ae411e864a..8f42597fce 100755
--- a/components/engine/hack/validate/gometalinter
+++ b/components/engine/hack/validate/gometalinter
@@ -6,6 +6,8 @@ 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
 # (somewhat pessimistic) default of 10 minutes.
+: ${GOMETALINTER_OPTS=--deadline=10m}
+
 gometalinter \
-	${GOMETALINTER_OPTS:--deadine 10m} \
+	${GOMETALINTER_OPTS} \
 	--config $SCRIPTDIR/gometalinter.json ./...