summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJintao Zhang <zhangjintao9020@gmail.com>2022-11-15 15:00:45 +0800
committerSebastiaan van Stijn <github@gone.nl>2022-11-16 14:03:34 +0100
commit2dce69e0016d64fc326d4c3600a45959608dd1cd (patch)
treed96fb51be8066bb2c16137100a03456356def798
parent5c4dc48995b69c785ac06f2b0fd9b01579649b1c (diff)
downloaddocker-2dce69e0016d64fc326d4c3600a45959608dd1cd.tar.gz
update containerd binary to v1.6.10
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> (cherry picked from commit a5979a2106c81dcad1155f64e6faff5b63ba5537) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-rw-r--r--Dockerfile.windows2
-rwxr-xr-xhack/dockerfile/install/containerd.installer2
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 3c44010e86..8085bf1f91 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
ARG GO_VERSION=1.19.3
ARG GOTESTSUM_VERSION=v1.8.1
ARG GOWINRES_VERSION=v0.2.3
-ARG CONTAINERD_VERSION=v1.6.9
+ARG CONTAINERD_VERSION=v1.6.10
# Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer
index 1227b787cd..4112eae82c 100755
--- a/hack/dockerfile/install/containerd.installer
+++ b/hack/dockerfile/install/containerd.installer
@@ -15,7 +15,7 @@ set -e
# the binary version you may also need to update the vendor version to pick up
# bug fixes or new APIs, however, usually the Go packages are built from a
# commit from the master branch.
-: "${CONTAINERD_VERSION:=v1.6.9}"
+: "${CONTAINERD_VERSION:=v1.6.10}"
install_containerd() (
echo "Install containerd version $CONTAINERD_VERSION"