summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2021-12-12 01:13:39 +0100
committerSebastiaan van Stijn <github@gone.nl>2021-12-12 01:13:39 +0100
commitd620cb6afc4273577b2c54d4c9426f8b46c0ced4 (patch)
tree5a1898ea27629c12146eebb22797297a28430cfc
parent8955d8da8951695a98eb7e15bead19d402c6eb27 (diff)
downloaddocker-d620cb6afc4273577b2c54d4c9426f8b46c0ced4.tar.gz
Update Go to 1.17.5
go1.17.5 (released 2021-12-09) includes security fixes to the syscall and net/http packages. See the Go 1.17.5 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.17.5+label%3ACherryPickApproved 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 5cbbfc61fb..43c45019fa 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.17.4
+ARG GO_VERSION=1.17.5
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_BUILDTAGS="apparmor seccomp"
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 6871a45a9b..a34c79d4ed 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.17.4
+ARG GO_VERSION=1.17.5
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
diff --git a/Dockerfile.simple b/Dockerfile.simple
index 8ccdbe2453..1a600faac6 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.17.4
+ARG GO_VERSION=1.17.5
ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
diff --git a/Dockerfile.windows b/Dockerfile.windows
index da17d5ae60..c0d21290d1 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.17.4
+ARG GO_VERSION=1.17.5
ARG CONTAINERD_VERSION=1.5.8
ARG GOTESTSUM_VERSION=v1.7.0