Merge pull request #41082 from thaJeztah/19.03_backport_bump_golang_1.13.12

[19.03 backport] Bump Golang 1.13.12
This commit is contained in:
Akihiro Suda 2020-06-12 07:38:30 +09:00 committed by GitHub
commit d5a82971a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -26,7 +26,7 @@
ARG CROSS="false" ARG CROSS="false"
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored # 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 DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e

View file

@ -1,4 +1,4 @@
ARG GO_VERSION=1.13.11 ARG GO_VERSION=1.13.12
FROM golang:${GO_VERSION}-alpine AS base FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off ENV GO111MODULE=off

View file

@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker. # 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 FROM golang:${GO_VERSION}-stretch
ENV GO111MODULE=off ENV GO111MODULE=off

View file

@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
# Use PowerShell as the default shell # Use PowerShell as the default shell
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ARG GO_VERSION=1.13.11 ARG GO_VERSION=1.13.12
# Environment variable notes: # Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.