From 058ea43c5c10fe545373e26ccd5a7dfa950c7241 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Sun, 7 Jun 2020 20:04:59 +0800 Subject: [PATCH] Bump Golang 1.13.12 Signed-off-by: Jintao Zhang (cherry picked from commit 004fd7be9250f87b584845f51dc9167c7f11eaa6) 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 1c966bf78e..c07e519e50 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.11 +ARG GO_VERSION=1.13.12 ARG DEBIAN_FRONTEND=noninteractive ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e diff --git a/Dockerfile.e2e b/Dockerfile.e2e index b7034fb217..878f88ac8a 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.11 +ARG GO_VERSION=1.13.12 FROM golang:${GO_VERSION}-alpine AS base ENV GO111MODULE=off diff --git a/Dockerfile.simple b/Dockerfile.simple index 4fb4080001..ea9b73532d 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.11 +ARG GO_VERSION=1.13.12 FROM golang:${GO_VERSION}-stretch ENV GO111MODULE=off diff --git a/Dockerfile.windows b/Dockerfile.windows index 1299306374..e878d039d0 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.11 +ARG GO_VERSION=1.13.12 # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.