summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2022-05-11 13:08:25 +0200
committerSebastiaan van Stijn <github@gone.nl>2022-05-11 13:08:25 +0200
commitd294078dd06f0eaa8faededf72d5e63fd6a6912e (patch)
treef669021abb7892d6fd9c25fd20e47eb40de3b1b4
parentb1e30e83289cb57d1ceab6bb0103f4a6dbdcca7a (diff)
downloaddocker-d294078dd06f0eaa8faededf72d5e63fd6a6912e.tar.gz
update golang to 1.18.2
go1.18.2 (released 2022-05-10) includes security fixes to the syscall package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, go/types, net/http/httptest, reflect, and sync/atomic packages. See the Go 1.18.2 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.18.2+label%3ACherryPickApproved Full diff: http://github.com/golang/go/compare/go1.18.1...go1.18.2 Includes fixes for: - CVE-2022-29526 (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29526); (description at https://go.dev/issue/52313). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-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 19166762e8..4b3cb30a02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
ARG CROSS="false"
ARG SYSTEMD="false"
-ARG GO_VERSION=1.18.1
+ARG GO_VERSION=1.18.2
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_BUILDTAGS="apparmor seccomp"
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 77228110f1..1af2c26bb0 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.1
+ARG GO_VERSION=1.18.2
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index 750c39ce1d..a328496bae 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.1
+ARG GO_VERSION=1.18.2
ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 2ef6e1bb3a..37836ab956 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.1
+ARG GO_VERSION=1.18.2
ARG CONTAINERD_VERSION=1.6.4
ARG GOTESTSUM_VERSION=v1.7.0
ARG GOWINRES_VERSION=v0.2.3