From deaf6e13ab067e6794d20ec980b4ae216b65d07c Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 19 Dec 2018 12:55:59 +0100
Subject: [PATCH] Bump Golang 1.11.4 (includes fix for CVE-2018-16875)

go1.11.4 (released 2018/12/14) includes fixes to cgo, the compiler, linker,
runtime, documentation, go command, and the net/http and go/types packages. It
includes a fix to a bug introduced in Go 1.11.3 that broke go get for import
path patterns containing "...".

See the Go 1.11.4 milestone for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.4+label%3ACherryPickApproved

go1.11.3 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.11.3 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 appveyor.yml                         | 2 +-
 dockerfiles/Dockerfile.binary-native | 2 +-
 dockerfiles/Dockerfile.cross         | 2 +-
 dockerfiles/Dockerfile.dev           | 2 +-
 dockerfiles/Dockerfile.e2e           | 2 +-
 dockerfiles/Dockerfile.lint          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index fe16b3b438..b5a8da994f 100644
--- 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.2
+  GOVERSION: 1.11.4
   DEPVERSION: v0.4.1
 
 install:
diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native
index 2f7601904b..a8a1e4b845 100644
--- a/dockerfiles/Dockerfile.binary-native
+++ b/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-FROM    golang:1.11.2-alpine
+FROM    golang:1.11.4-alpine
 
 RUN     apk add -U git bash coreutils gcc musl-dev
 
diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross
index 9463a50f04..6eec5dc5e3 100644
--- a/dockerfiles/Dockerfile.cross
+++ b/dockerfiles/Dockerfile.cross
@@ -1,4 +1,4 @@
-FROM	dockercore/golang-cross:1.11.2@sha256:7e8945e30dae5d6455a3e75e5091e642f79110301a86d08f8c93991518e930b3
+FROM	dockercore/golang-cross:1.11.4@sha256:9e5f0013a7dbc49b6726267577803202b403be1a560c0c03c4e215d7e2476b1b
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /go/src/github.com/docker/cli
 COPY    . .
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index f060dc260f..33e8d48042 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM    golang:1.11.2-alpine
+FROM    golang:1.11.4-alpine
 
 RUN     apk add -U git make bash coreutils ca-certificates curl
 
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
index 722761055f..000c38561f 100644
--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.11.2
+ARG GO_VERSION=1.11.4
 
 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process
 
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index e0c8df3f39..46bc7db79c 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM    golang:1.11.2-alpine
+FROM    golang:1.11.4-alpine
 
 RUN     apk add -U git