From 30a5b4621e5ff45930bad9dbf7d881264e2ac3a8 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 14 Jun 2019 12:46:35 +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: a14e6cafbc02cfd82c97dc517ac15db5677065bb
Component: engine
---
 components/engine/Dockerfile         | 2 +-
 components/engine/Dockerfile.e2e     | 2 +-
 components/engine/Dockerfile.simple  | 2 +-
 components/engine/Dockerfile.windows | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
index 89945e381f..c8a62fb206 100644
--- a/components/engine/Dockerfile
+++ b/components/engine/Dockerfile
@@ -24,7 +24,7 @@
 # the case. Therefore, you don't have to disable it anymore.
 #
 
-FROM golang:1.11.10 AS base
+FROM golang:1.11.11 AS base
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org
 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
diff --git a/components/engine/Dockerfile.e2e b/components/engine/Dockerfile.e2e
index 561ef36965..4b6addf4e2 100644
--- a/components/engine/Dockerfile.e2e
+++ b/components/engine/Dockerfile.e2e
@@ -1,5 +1,5 @@
 ## Step 1: Build tests
-FROM golang:1.11.10-alpine3.9 as builder
+FROM golang:1.11.11-alpine3.9 as builder
 
 RUN apk add --update \
     bash \
diff --git a/components/engine/Dockerfile.simple b/components/engine/Dockerfile.simple
index edcff926cd..b188c5d99f 100644
--- a/components/engine/Dockerfile.simple
+++ b/components/engine/Dockerfile.simple
@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-FROM golang:1.11.10-stretch
+FROM golang:1.11.11-stretch
 
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org
diff --git a/components/engine/Dockerfile.windows b/components/engine/Dockerfile.windows
index 3911fbaba4..b93d7d5721 100644
--- a/components/engine/Dockerfile.windows
+++ b/components/engine/Dockerfile.windows
@@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
 #  - FROM_DOCKERFILE is used for detection of building within a container.
-ENV GO_VERSION=1.11.10 `
+ENV GO_VERSION=1.11.11 `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\go `
     FROM_DOCKERFILE=1