Merge pull request #2113 from thaJeztah/19.03_backport_bump_golang_1.12.10

thaJeztah · web-flow · commit 012332290023 · 2019-09-28T01:53:31.000+02:00
[19.03 backport] bump golang 1.12.10 (CVE-2019-16276) Upstream-commit: 3fb239756dd3d8da24e71cd5957175b9ffb5de0c Component: cli
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.12.9
+  GOVERSION: 1.12.10
   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.12.9
+ARG GO_VERSION=1.12.10
 
 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.12.9
+ARG GO_VERSION=1.12.10
 
 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.12.9
+ARG GO_VERSION=1.12.10
 
 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.12.9
+ARG GO_VERSION=1.12.10
 
 # Use Debian based image as docker-compose requires glibc.
 FROM golang:${GO_VERSION}
diff --git a/components/cli/dockerfiles/Dockerfile.lint b/components/cli/dockerfiles/Dockerfile.lint
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.9
+ARG GO_VERSION=1.12.10
 
 FROM    golang:${GO_VERSION}-alpine
 

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