Merge pull request #1998 from thaJeztah/19.03_backport_bump_golang_1.12.7

andrewhsu · web-flow · commit 036b00737339 · 2019-08-07T17:48:16.000-07:00
[19.03 backport] Bump golang 1.12.7
Upstream-commit: 1a8077b814a0fabd204b35283500f4c133de210b
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.5
+  GOVERSION: 1.12.7
   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 @@
-FROM    golang:1.12.5-alpine
+FROM    golang:1.12.7-alpine
 
 RUN     apk add -U git bash coreutils gcc musl-dev
 
diff --git a/components/cli/dockerfiles/Dockerfile.cross b/components/cli/dockerfiles/Dockerfile.cross
@@ -1,4 +1,4 @@
-FROM	dockercore/golang-cross:1.12.5
+FROM	dockercore/golang-cross:1.12.7
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /go/src/github.com/docker/cli
 COPY    . .
diff --git a/components/cli/dockerfiles/Dockerfile.dev b/components/cli/dockerfiles/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM    golang:1.12.5-alpine
+FROM    golang:1.12.7-alpine
 
 RUN     apk add -U git make bash coreutils ca-certificates curl
 
diff --git a/components/cli/dockerfiles/Dockerfile.e2e b/components/cli/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.5
+ARG GO_VERSION=1.12.7
 
 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process
 
diff --git a/components/cli/dockerfiles/Dockerfile.lint b/components/cli/dockerfiles/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM    golang:1.12.5-alpine
+FROM    golang:1.12.7-alpine
 
 RUN     apk add -U git
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.12.5-alpine`
	`1`	`+FROM golang:1.12.7-alpine`
`2`	`2`
`3`	`3`	`RUN apk add -U git bash coreutils gcc musl-dev`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG GO_VERSION=1.12.5`
	`1`	`+ARG GO_VERSION=1.12.7`
`2`	`2`
`3`	`3`	`FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process`
`4`	`4`