From 7cb13d4d85990555be1317ae32b394e98a779379 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 9 Apr 2020 21:58:09 +0200 Subject: [PATCH] Bump Golang 1.13.10 go1.13.10 (released 2020/04/08) includes fixes to the go command, the runtime, os/exec, and time packages. See the Go 1.13.10 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.13.10+label%3ACherryPickApproved full diff: https://github.com/golang/go/compare/go1.13.9...go1.13.10 Signed-off-by: Sebastiaan van Stijn --- 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 f7a394e9a3..411ddb52bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG CROSS="false" ARG SYSTEMD="false" -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.13.10 ARG DEBIAN_FRONTEND=noninteractive ARG VPNKIT_VERSION=0.4.0 ARG DOCKER_BUILDTAGS="apparmor seccomp selinux" diff --git a/Dockerfile.e2e b/Dockerfile.e2e index da64a076ae..f93ff86681 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.13.10 FROM golang:${GO_VERSION}-alpine AS base ENV GO111MODULE=off diff --git a/Dockerfile.simple b/Dockerfile.simple index 761aaf0e46..75d9a84b4e 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.9 +ARG GO_VERSION=1.13.10 FROM golang:${GO_VERSION}-stretch ENV GO111MODULE=off diff --git a/Dockerfile.windows b/Dockerfile.windows index 7f281e8be9..412138d1ee 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.9 +ARG GO_VERSION=1.13.10 ARG GOTESTSUM_COMMIT=v0.3.5 # Environment variable notes: