Merge pull request #44101 from thaJeztah/20.10_backport_bump_golang_1…

….18.6
moby · Sep 7, 2022 · 4855c28 · 4855c28
2 parents d56101e + 3d4616f
commit 4855c28
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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.18.5
+ARG GO_VERSION=1.18.6
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG DOCKER_BUILDTAGS="apparmor seccomp"

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.5
+ARG GO_VERSION=1.18.6
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off

diff --git 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.18.5
+ARG GO_VERSION=1.18.6
 
 FROM golang:${GO_VERSION}-buster
 ENV GO111MODULE=off

diff --git 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.18.5
+ARG GO_VERSION=1.18.6
 ARG GOTESTSUM_VERSION=v1.7.0
 
 # Environment variable notes: