Merge pull request #43802 from thaJeztah/bump_go_1.18.4

update golang to 1.18.4
moby · Jul 14, 2022 · c7d2099 · c7d2099
2 parents c8a0e1d + 34b8670
commit c7d2099
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: 1.18.3
+  GO_VERSION: 1.18.4
   GOTESTLIST_VERSION: v0.2.0
   TESTSTAT_VERSION: v0.1.3
   WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG CROSS="false"
 ARG SYSTEMD="false"
-ARG GO_VERSION=1.18.3
+ARG GO_VERSION=1.18.4
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.3
+ARG GO_VERSION=1.18.4
 
 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.3
+ARG GO_VERSION=1.18.4
 
 ARG BASE_DEBIAN_DISTRO="bullseye"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

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.3
+ARG GO_VERSION=1.18.4
 ARG CONTAINERD_VERSION=v1.6.6
 ARG GOTESTSUM_VERSION=v1.8.1
 ARG GOWINRES_VERSION=v0.2.3