From dd8eddb4df6a5cabd89ca124d2ba2ef8cc8e6b27 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 14 Jun 2019 12:55:09 +0200
Subject: [PATCH] Bump golang 1.11.11

go1.11.11 (released 2019/06/11) includes a fix to the crypto/x509 package.
See the Go 1.11.11 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.11

full diff: https://github.com/golang/go/compare/go1.11.10...go1.11.11

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

diff --git a/components/cli/appveyor.yml b/components/cli/appveyor.yml
index 8e5c832c1a..99157df193 100644
--- a/components/cli/appveyor.yml
+++ b/components/cli/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.11.10
+  GOVERSION: 1.11.11
   DEPVERSION: v0.4.1
 
 install:
diff --git a/components/cli/dockerfiles/Dockerfile.binary-native b/components/cli/dockerfiles/Dockerfile.binary-native
index c5bac52ece..b1f3ae82c2 100644
--- a/components/cli/dockerfiles/Dockerfile.binary-native
+++ b/components/cli/dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
-FROM    golang:1.11.10-alpine
+FROM    golang:1.11.11-alpine
 
 RUN     apk add -U git bash coreutils gcc musl-dev
 
diff --git a/components/cli/dockerfiles/Dockerfile.cross b/components/cli/dockerfiles/Dockerfile.cross
index 40370a601a..bcca51857a 100644
--- a/components/cli/dockerfiles/Dockerfile.cross
+++ b/components/cli/dockerfiles/Dockerfile.cross
@@ -1,4 +1,4 @@
-FROM	dockercore/golang-cross:1.11.10
+FROM	dockercore/golang-cross:1.11.11
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /go/src/github.com/docker/cli
 COPY    . .
diff --git a/components/cli/dockerfiles/Dockerfile.dev b/components/cli/dockerfiles/Dockerfile.dev
index 195b7d78f8..d7731fb2cb 100644
--- a/components/cli/dockerfiles/Dockerfile.dev
+++ b/components/cli/dockerfiles/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM    golang:1.11.10-alpine
+FROM    golang:1.11.11-alpine
 
 RUN     apk add -U git make bash coreutils ca-certificates curl
 
diff --git a/components/cli/dockerfiles/Dockerfile.e2e b/components/cli/dockerfiles/Dockerfile.e2e
index 30266a8218..e721b971a9 100644
--- a/components/cli/dockerfiles/Dockerfile.e2e
+++ b/components/cli/dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.11.10
+ARG GO_VERSION=1.11.11
 
 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process
 
diff --git a/components/cli/dockerfiles/Dockerfile.lint b/components/cli/dockerfiles/Dockerfile.lint
index c0ba6177c3..7f0ecb8dd9 100644
--- a/components/cli/dockerfiles/Dockerfile.lint
+++ b/components/cli/dockerfiles/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM    golang:1.11.10-alpine
+FROM    golang:1.11.11-alpine
 
 RUN     apk add -U git