From d68385b86197a47e8cae6e0bcd0eba7578eecf74 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 17 Jan 2020 15:18:44 +0100
Subject: [PATCH] Update Golang 1.13.6

full diff: https://github.com/golang/go/compare/go1.13.5...go1.13.6

go1.13.6 (released 2020/01/09) includes fixes to the runtime and the net/http
package. See the Go 1.13.6 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.6+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile         | 2 +-
 Dockerfile.e2e     | 2 +-
 Dockerfile.simple  | 2 +-
 Dockerfile.windows | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ae303e157..e84ad706c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.1.3-experimental
 
 ARG CROSS="false"
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
 ARG DOCKER_BUILDTAGS="apparmor seccomp selinux"
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index d616e704e8..ef76446a25 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index 2935d49838..cbb61230cf 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 
 FROM golang:${GO_VERSION}-stretch
 ENV GO111MODULE=off
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 45ef1006dc..a630049efc 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 ARG GOTESTSUM_COMMIT=v0.3.5
 
 # Environment variable notes: