diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2020-06-08 12:11:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 12:11:27 +0200 |
| commit | 2dd013458988ce30eba34c57c088e2438b372aa4 (patch) | |
| tree | 56b20e636ee9e819531ed7123cbe370ba98f5018 | |
| parent | 5ffd6778244c912de94259c9cde487d270757e2a (diff) | |
| parent | 004fd7be9250f87b584845f51dc9167c7f11eaa6 (diff) | |
| download | docker-2dd013458988ce30eba34c57c088e2438b372aa4.tar.gz | |
Merge pull request #41078 from tao12345666333/update-golang-1.13.12
Bump Golang 1.13.12
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.buildx | 2 | ||||
| -rw-r--r-- | Dockerfile.e2e | 2 | ||||
| -rw-r--r-- | Dockerfile.simple | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index b2b11c65ab..12a4e47289 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG CROSS="false" ARG SYSTEMD="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_VERSION=0.4.0 ARG DOCKER_BUILDTAGS="apparmor seccomp selinux" diff --git a/Dockerfile.buildx b/Dockerfile.buildx index 667d9230fb..30b1550912 100644 --- a/Dockerfile.buildx +++ b/Dockerfile.buildx @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.13.11 +ARG GO_VERSION=1.13.12 ARG BUILDX_COMMIT=v0.3.1 ARG BUILDX_REPO=https://github.com/docker/buildx.git 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 9ad3437b14..1cf665c9f6 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 ARG GOTESTSUM_COMMIT=v0.3.5 # Environment variable notes: |