From c351539358b2bf83bf505fed1792f767ec370581 Mon Sep 17 00:00:00 2001
From: Austin Vazquez <austin.vazquez@docker.com>
Date: Wed, 5 Nov 2025 19:11:57 -0600
Subject: [PATCH] Dockerfile: test containerd v2.1.5 (linux), v2.0.7 (windows)

Update the version of containerd used in CI and for static binaries
to v2.1.5 (linux) and v2.0.7 (windows)

Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
---
 Dockerfile                                   | 2 +-
 Dockerfile.windows                           | 2 +-
 hack/dockerfile/install/containerd.installer | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 384d53cb8e..3d9138b3ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -163,7 +163,7 @@ RUN git init . && git remote add origin "https://github.com/containerd/container
 # integration tests. The distributed docker .deb and .rpm packages depend on a
 # separate (containerd.io) package, which may be a different version as is
 # specified here.
-ARG CONTAINERD_VERSION=v2.1.4
+ARG CONTAINERD_VERSION=v2.1.5
 RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
 
 FROM base AS containerd-build
diff --git a/Dockerfile.windows b/Dockerfile.windows
index e528df7b5e..af7af5de16 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -171,7 +171,7 @@ ARG GOWINRES_VERSION=v0.3.3
 
 # TODO: Update containerd version to match Linux version once 
 # https://github.com/microsoft/hcsshim/issues/2488 is resolved.
-ARG CONTAINERD_VERSION=v2.0.6
+ARG CONTAINERD_VERSION=v2.0.7
 
 # 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 bab52e305d..80bb34b50e 100755
--- a/hack/dockerfile/install/containerd.installer
+++ b/hack/dockerfile/install/containerd.installer
@@ -10,7 +10,7 @@ set -e
 # as is specified here.
 #
 # Generally, the commit specified here should match a tagged release.
-: "${CONTAINERD_VERSION:=v2.1.4}"
+: "${CONTAINERD_VERSION:=v2.1.5}"
 
 install_containerd() (
 	echo "Install containerd version $CONTAINERD_VERSION"