Merge pull request #1636 from thaJeztah/bump_golang_1.11.5

Bump Golang 1.11.5 (CVE-2019-6486)
docker · Jan 24, 2019 · ffa55ab · ffa55ab
2 parents ebb121e + 0e9d1d3
commit ffa55ab
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.11.4
+  GOVERSION: 1.11.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.11.4-alpine
+FROM    golang:1.11.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.11.4@sha256:9e5f0013a7dbc49b6726267577803202b403be1a560c0c03c4e215d7e2476b1b
+FROM	dockercore/golang-cross:1.11.5@sha256:17a7e0f158521c50316a0d0c1ab1f6a75350b4d82e7ef03c98bcfbdf04feb4f3
 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.11.4-alpine
+FROM    golang:1.11.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.11.4
+ARG GO_VERSION=1.11.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.11.4-alpine
+FROM    golang:1.11.5-alpine
 
 RUN     apk add -U git