From bd129e88cff9db257be42be24b18eab78366fc8b Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 23 Jan 2019 23:44:34 +0100
Subject: [PATCH] Bump Golang 1.11.5 (CVE-2019-6486)

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 20b34412dc8a3099f658545e8504e1fc1326b3cb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4add22cc49057ec58284ba12afbf5a7c3c290805
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 3b4758defe..3bbe2dd6d6 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.4 AS base
+FROM golang:1.11.5 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 79fb61d04f..afe568308a 100644
--- a/components/engine/Dockerfile.e2e
+++ b/components/engine/Dockerfile.e2e
@@ -1,5 +1,5 @@
 ## Step 1: Build tests
-FROM golang:1.11.4-alpine3.8 as builder
+FROM golang:1.11.5-alpine3.8 as builder
 
 RUN apk add --update \
     bash \
diff --git a/components/engine/Dockerfile.simple b/components/engine/Dockerfile.simple
index 2ba2d1a44d..3ea2468f4f 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.4-stretch
+FROM golang:1.11.5-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 0624fc600e..8cdd0b7c3d 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.4 `
+ENV GO_VERSION=1.11.5 `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\go `
     FROM_DOCKERFILE=1