Merge component 'cli' from git@github.com:docker/cli 19.03

GordonTheTurtle · GordonTheTurtle · commit e0b868f387e3 · 2020-09-15T23:50:24.000Z
diff --git a/components/cli/appveyor.yml b/components/cli/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.13.14
+  GOVERSION: 1.13.15
   DEPVERSION: v0.4.1
 
 install:
diff --git a/components/cli/dockerfiles/Dockerfile.binary-native b/components/cli/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 
 FROM    golang:${GO_VERSION}-alpine
 
diff --git a/components/cli/dockerfiles/Dockerfile.cross b/components/cli/dockerfiles/Dockerfile.cross
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 
 FROM	dockercore/golang-cross:${GO_VERSION}
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
diff --git a/components/cli/dockerfiles/Dockerfile.dev b/components/cli/dockerfiles/Dockerfile.dev
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 
 FROM    golang:${GO_VERSION}-alpine
 
diff --git a/components/cli/dockerfiles/Dockerfile.e2e b/components/cli/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 
 # Use Debian based image as docker-compose requires glibc.
 FROM golang:${GO_VERSION}-buster
diff --git a/components/cli/dockerfiles/Dockerfile.lint b/components/cli/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.1.3-experimental
 
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 ARG GOLANGCI_LINTER_SHA="v1.21.0"
 
 FROM    golang:${GO_VERSION}-alpine AS build

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG GO_VERSION=1.13.14`
	`1`	`+ARG GO_VERSION=1.13.15`
`2`	`2`
`3`	`3`	`FROM golang:${GO_VERSION}-alpine`
`4`	`4`