From fd6a419ad53f5abd2f556897f3ce5ee021375e1b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 31 Jan 2024 14:02:30 +0100 Subject: [PATCH] update containerd binary to v1.7.13 Update the containerd binary that's used in CI - full diff: https://github.com/containerd/containerd/compare/v1.7.12...v1.7.13 - release notes: https://github.com/containerd/containerd/releases/tag/v1.7.13 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 835cdcac95d6fe785343598213ef18310f90a2f8) Signed-off-by: Sebastiaan van Stijn --- 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 485d44f90104f..bcc11cbffa8c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -198,7 +198,7 @@ RUN git init . && git remote add origin "https://github.com/containerd/container # When updating 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. -ARG CONTAINERD_VERSION=v1.7.12 +ARG CONTAINERD_VERSION=v1.7.13 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 17573b55a15c3..23bbdc38610a6 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -164,7 +164,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ARG GO_VERSION=1.21.6 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 -ARG CONTAINERD_VERSION=v1.7.12 +ARG CONTAINERD_VERSION=v1.7.13 # 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 6896181a77b4d..3275d8f7a7e10 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.7.12}" +: "${CONTAINERD_VERSION:=v1.7.13}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION"