From 282567a58d926244c6bdf129e37a0ebf9efa1f09 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 (cherry picked from commit 7cb13d4d85990555be1317ae32b394e98a779379) 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 034a47af2d..aebc8d223b 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.9 +ARG GO_VERSION=1.13.10 ARG DEBIAN_FRONTEND=noninteractive ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e 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 0fa83c53e3..3621bc220e 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 # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.