diff --git a/Dockerfile b/Dockerfile index 18cea2e8e1..dbf4a3d194 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=v1.7.28 +ARG CONTAINERD_VERSION=v2.1.4 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 11630f645b..e528df7b5e 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -168,7 +168,10 @@ ARG GOTESTSUM_VERSION=v1.13.0 # GOWINRES_VERSION is the version of go-winres to install. ARG GOWINRES_VERSION=v0.3.3 -ARG CONTAINERD_VERSION=v1.7.28 + +# TODO: Update containerd version to match Linux version once +# https://github.com/microsoft/hcsshim/issues/2488 is resolved. +ARG CONTAINERD_VERSION=v2.0.6 # 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 2c00c90d8c..bab52e305d 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:=v1.7.28}" +: "${CONTAINERD_VERSION:=v2.1.4}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION"