From 9fe291827a4730ef97452919037d349b98e5d85c Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 10 Aug 2020 12:13:38 +0200
Subject: [PATCH] Bump Golang 1.13.15

full diff: https://github.com/golang/go/compare/go1.13.14...go1.13.15

go1.13.15 (released 2020/08/06) includes security fixes to the encoding/binary
package. See the Go 1.13.15 milestone on the issue tracker for details.

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2a6325e310f7ac4f8a5547dbd42d11a688dac90f)
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 45d608cd65..5623b0fa13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@
 
 ARG CROSS="false"
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
 
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index d9d1f16ecd..4b6ec66031 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.14
+ARG GO_VERSION=1.13.15
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index d58592db47..e461adadf8 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.14
+ARG GO_VERSION=1.13.15
 
 FROM golang:${GO_VERSION}-stretch
 ENV GO111MODULE=off
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 008148f31d..e9277cebc2 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.14
+ARG GO_VERSION=1.13.15
 
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.