summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/windows.yml2
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.e2e2
-rw-r--r--Dockerfile.simple2
-rw-r--r--Dockerfile.windows2
5 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 075003bcd2..6d6fee241a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ on:
pull_request:
env:
- GO_VERSION: 1.18.4
+ GO_VERSION: 1.18.5
GOTESTLIST_VERSION: v0.2.0
TESTSTAT_VERSION: v0.1.3
WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore
diff --git a/Dockerfile b/Dockerfile
index 4085767e96..9bb4ba4d66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
ARG CROSS="false"
ARG SYSTEMD="false"
-ARG GO_VERSION=1.18.4
+ARG GO_VERSION=1.18.5
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 7f64cc5caf..562c5d5a60 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.4
+ARG GO_VERSION=1.18.5
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index 782bb8143f..29397631ef 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.18.4
+ARG GO_VERSION=1.18.5
ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 6a292b7ce7..c75a504653 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.18.4
+ARG GO_VERSION=1.18.5
ARG CONTAINERD_VERSION=v1.6.6
ARG GOTESTSUM_VERSION=v1.8.1
ARG GOWINRES_VERSION=v0.2.3