Merge pull request #1832 from thaJeztah/bump_golang_1.12.4

thaJeztah · web-flow · commit 552e8d1a73fc · 2019-04-18T01:53:53.000+02:00
Bump Golang 1.12.4
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.12.3
+  GOVERSION: 1.12.4
   DEPVERSION: v0.4.1
 
 install:
diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-FROM    golang:1.12.3-alpine
+FROM    golang:1.12.4-alpine
 
 RUN     apk add -U git bash coreutils gcc musl-dev
 
diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross
@@ -1,4 +1,4 @@
-FROM	dockercore/golang-cross:1.12.3@sha256:b88a6be2469d321601f87675c49d1b3f166c4c37abc5ce3e74557fc6660481be
+FROM	dockercore/golang-cross:1.12.4
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /go/src/github.com/docker/cli
 COPY    . .
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM    golang:1.12.3-alpine
+FROM    golang:1.12.4-alpine
 
 RUN     apk add -U git make bash coreutils ca-certificates curl
 
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.3
+ARG GO_VERSION=1.12.4
 
 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process
 
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM    golang:1.12.3-alpine
+FROM    golang:1.12.4-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.3-alpine`
	`1`	`+FROM golang:1.12.4-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.3`
	`1`	`+ARG GO_VERSION=1.12.4`
`2`	`2`
`3`	`3`	`FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process`
`4`	`4`