From 9c66a2f4e15d1f6671c9de9b841dd4f0bc8fc0ce Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 17 Jul 2020 15:17:15 +0200
Subject: [PATCH] Bump Golang 1.13.14
full diff: https://github.com/golang/go/compare/go1.13.13...go1.13.14
go1.13.14 (released 2020/07/16) includes fixes to the compiler, vet, and the
database/sql, net/http, and reflect packages. See the Go 1.13.14 milestone on
the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.14+label%3ACherryPickApproved
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
Dockerfile | 2 +-
Dockerfile.buildx | 2 +-
Dockerfile.e2e | 2 +-
Dockerfile.simple | 2 +-
Dockerfile.windows | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 84ba903a69..8bb3600fd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
ARG CROSS="false"
ARG SYSTEMD="false"
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
-ARG GO_VERSION=1.13.13
+ARG GO_VERSION=1.13.14
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.4.0
ARG DOCKER_BUILDTAGS="apparmor seccomp selinux"
diff --git a/Dockerfile.buildx b/Dockerfile.buildx
index 0b432ba8fc..4ed0a562b7 100644
--- a/Dockerfile.buildx
+++ b/Dockerfile.buildx
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.13
+ARG GO_VERSION=1.13.14
ARG BUILDX_COMMIT=v0.3.1
ARG BUILDX_REPO=https://github.com/docker/buildx.git
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index c85c0a210c..16b9ba81f7 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.13
+ARG GO_VERSION=1.13.14
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index ad88944273..4420959987 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.13
+ARG GO_VERSION=1.13.14
FROM golang:${GO_VERSION}-buster
ENV GO111MODULE=off
diff --git a/Dockerfile.windows b/Dockerfile.windows
index e8a9a32724..7fc17e6944 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.13
+ARG GO_VERSION=1.13.14
ARG GOTESTSUM_COMMIT=v0.3.5
# Environment variable notes: