Merge pull request #1575 from thaJeztah/bump_golang_1.10.6

[18.09] Bump Golang 1.10.6 (CVE-2018-16875)
docker · Dec 14, 2018 · 2fa3aae · 2fa3aae
2 parents 3ee6755 + 6c3a10a
commit 2fa3aae
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.10.5
+  GOVERSION: 1.10.6
   DEPVERSION: v0.4.1
 
 install:

diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-FROM    golang:1.10.5-alpine
+FROM    golang:1.10.6-alpine
 
 RUN     apk add -U git bash coreutils gcc musl-dev
 

diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross
@@ -1,3 +1,3 @@
-FROM    dockercore/golang-cross:1.10.5@sha256:e41607859366a2480445d196a5a502817e5f6ab90e8b5f55db95375fec0c0008
+FROM    dockercore/golang-cross:1.10.6@sha256:2054e793010774e9dbafc808dd550a99f8468013731728bea7fce56681510078
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /go/src/github.com/docker/cli
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
@@ -1,5 +1,5 @@
 
-FROM    golang:1.10.5-alpine
+FROM    golang:1.10.6-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.10.5
+ARG GO_VERSION=1.10.6
 
 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.10.5-alpine
+FROM    golang:1.10.6-alpine
 
 RUN     apk add -U git