summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiaan van Stijn <thaJeztah@users.noreply.github.com>2023-01-11 16:25:23 +0100
committerGitHub <noreply@github.com>2023-01-11 16:25:23 +0100
commitd0a3f3a37611c03d58343293240c33c26595f093 (patch)
tree2dae9e2048b2c234ebe069cd8406f7d2b84f439f
parentde10f917ead385976759a63d341a1a39090f7c21 (diff)
parent625903f3fda862c69492256016b386628954b3a4 (diff)
downloaddocker-d0a3f3a37611c03d58343293240c33c26595f093.tar.gz
Merge pull request #44795 from thaJeztah/20.10_bump_go_1.18.10
[20.10] update to go1.18.10
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.e2e2
-rw-r--r--Dockerfile.simple2
-rw-r--r--Dockerfile.windows2
4 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 508e9dffa4..481c9e288b 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.18.9
+ARG GO_VERSION=1.18.10
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_BUILDTAGS="apparmor seccomp"
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 50572f64b3..393bb0c7f0 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.9
+ARG GO_VERSION=1.18.10
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index c8655ad2db..af541eab0c 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.9
+ARG GO_VERSION=1.18.10
FROM golang:${GO_VERSION}-buster
ENV GO111MODULE=off
diff --git a/Dockerfile.windows b/Dockerfile.windows
index e62154d58e..0aaf4f5167 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.9
+ARG GO_VERSION=1.18.10
ARG GOTESTSUM_VERSION=v1.8.2
# Environment variable notes: