Merge pull request #40592 from thaJeztah/19.03_backport_bump_golang_1.13

[19.03 backport] Update Golang 1.13.9
This commit is contained in:
Akihiro Suda 2020-04-09 05:43:14 +09:00 committed by GitHub
commit 4275aec641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View file

@ -26,7 +26,7 @@
ARG CROSS="false"
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
ARG GO_VERSION=1.12.17
ARG GO_VERSION=1.13.9
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e

View file

@ -1,4 +1,4 @@
ARG GO_VERSION=1.12.17
ARG GO_VERSION=1.13.9
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
@ -51,7 +51,7 @@ RUN hack/make.sh build-integration-test-binary
RUN mkdir -p /build/tests && find . -name test.main -exec cp --parents '{}' /build/tests \;
## Generate testing image
FROM alpine:3.9 as runner
FROM alpine:3.10 as runner
ENV DOCKER_REMOTE_DAEMON=1
ENV DOCKER_INTEGRATION_DAEMON_DEST=/

View file

@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker.
ARG GO_VERSION=1.12.17
ARG GO_VERSION=1.13.9
FROM golang:${GO_VERSION}-stretch
ENV GO111MODULE=off

View file

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