Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit faf511b

Browse files
authored
Merge pull request #40592 from thaJeztah/19.03_backport_bump_golang_1.13
[19.03 backport] Update Golang 1.13.9 Upstream-commit: 4275aec641fe3773801819cf6bf59ad191cc3009 Component: engine
2 parents a8adfc4 + 5ceee87 commit faf511b

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

components/engine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
ARG CROSS="false"
2828
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
29-
ARG GO_VERSION=1.12.17
29+
ARG GO_VERSION=1.13.9
3030
ARG DEBIAN_FRONTEND=noninteractive
3131
ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
3232

components/engine/Dockerfile.e2e

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.12.17
1+
ARG GO_VERSION=1.13.9
22

33
FROM golang:${GO_VERSION}-alpine AS base
44
ENV GO111MODULE=off
@@ -51,7 +51,7 @@ RUN hack/make.sh build-integration-test-binary
5151
RUN mkdir -p /build/tests && find . -name test.main -exec cp --parents '{}' /build/tests \;
5252

5353
## Generate testing image
54-
FROM alpine:3.9 as runner
54+
FROM alpine:3.10 as runner
5555

5656
ENV DOCKER_REMOTE_DAEMON=1
5757
ENV DOCKER_INTEGRATION_DAEMON_DEST=/

components/engine/Dockerfile.simple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# This represents the bare minimum required to build and test Docker.
77

8-
ARG GO_VERSION=1.12.17
8+
ARG GO_VERSION=1.13.9
99

1010
FROM golang:${GO_VERSION}-stretch
1111
ENV GO111MODULE=off

components/engine/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
165165
# Use PowerShell as the default shell
166166
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
167167

168-
ARG GO_VERSION=1.12.17
168+
ARG GO_VERSION=1.13.9
169169

170170
# Environment variable notes:
171171
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

0 commit comments

Comments
 (0)