diff --git a/cli/command/container/opts_test.go b/cli/command/container/opts_test.go
index 67f0cad44d..6d7c95a5dd 100644
--- a/cli/command/container/opts_test.go
+++ b/cli/command/container/opts_test.go
@@ -42,7 +42,6 @@ func TestValidateAttach(t *testing.T) {
 	}
 }
 
-// nolint: unparam
 func parseRun(args []string) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
 	flags, copts := setupRunFlags()
 	if err := flags.Parse(args); err != nil {
diff --git a/cli/command/registry/login_test.go b/cli/command/registry/login_test.go
index 7e77494186..d050ff59ab 100644
--- a/cli/command/registry/login_test.go
+++ b/cli/command/registry/login_test.go
@@ -28,7 +28,6 @@ type fakeClient struct {
 	client.Client
 }
 
-// nolint: unparam
 func (c fakeClient) RegistryLogin(ctx context.Context, auth types.AuthConfig) (registrytypes.AuthenticateOKBody, error) {
 	if auth.Password == expiredPassword {
 		return registrytypes.AuthenticateOKBody{}, fmt.Errorf("Invalid Username or Password")
diff --git a/cli/command/trust/signer_remove.go b/cli/command/trust/signer_remove.go
index d4e8eec42b..6945f54e03 100644
--- a/cli/command/trust/signer_remove.go
+++ b/cli/command/trust/signer_remove.go
@@ -78,6 +78,7 @@ func isLastSignerForReleases(roleWithSig data.Role, allRoles []client.RoleWithSi
 
 // removeSingleSigner attempts to remove a single signer and returns whether signer removal happened.
 // The signer not being removed doesn't necessarily raise an error e.g. user choosing "No" when prompted for confirmation.
+// nolint: unparam
 func removeSingleSigner(cli command.Cli, repoName, signerName string, forceYes bool) (bool, error) {
 	ctx := context.Background()
 	imgRefAndAuth, err := trust.GetImageReferencesAndAuth(ctx, nil, image.AuthResolver(cli), repoName)
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index 9726eecb42..a55e37faf4 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -2,7 +2,7 @@ FROM    golang:1.10.3-alpine
 
 RUN     apk add -U git
 
-ARG     GOMETALINTER_SHA=7f9672e7ea538b8682e83395d50b12f09bb17b91
+ARG     GOMETALINTER_SHA=v2.0.6
 RUN     go get -d github.com/alecthomas/gometalinter && \
         cd /go/src/github.com/alecthomas/gometalinter && \
         git checkout -q "$GOMETALINTER_SHA" && \
@@ -10,13 +10,6 @@ RUN     go get -d github.com/alecthomas/gometalinter && \
         gometalinter --install && \
         rm -rf /go/src/* /go/pkg/*
 
-ARG     NAKEDRET_SHA=3ddb495a6d63bc9041ba843e7d651cf92639d8cb
-RUN     go get -d github.com/alexkohler/nakedret && \
-        cd /go/src/github.com/alexkohler/nakedret && \
-        git checkout -q "$NAKEDRET_SHA" && \
-        go build -v -o /usr/local/bin/nakedret . && \
-        rm -rf /go/src/* /go/pkg/*
-
 WORKDIR /go/src/github.com/docker/cli
 ENV     CGO_ENABLED=0
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1