Merge pull request #1875 from thaJeztah/19.03_backport_bump-golang-1.…

…12.5 [19.03 backport] Bump golang 1.12.5
docker · May 13, 2019 · a4ba583 · a4ba583
2 parents ac45214 + 11f5e33
commit a4ba583
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
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.4
+  GOVERSION: 1.12.5
   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.4-alpine
+FROM    golang:1.12.5-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.4
+FROM	dockercore/golang-cross:1.12.5
 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.4-alpine
+FROM    golang:1.12.5-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.4
+ARG GO_VERSION=1.12.5
 
 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.4-alpine
+FROM    golang:1.12.5-alpine
 
 RUN     apk add -U git