From d3884731cd5e26c1eeaaee864f090390f2900cc2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Sep 2024 10:44:44 +0200 Subject: [PATCH] Dockerfile: update containerd binary to v1.7.22 Update the containerd binary that's used in CI and static binaries - Update to go1.22.7, go1.23.1 - CRI: Cumulative stats can't decrease - Fix bug where init exits were being dropped - Update runc binary to 1.1.14 - diff: https://github.com/containerd/containerd/compare/v1.7.21...v1.7.22 - release notes: https://github.com/containerd/containerd/releases/tag/v1.7.22 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 92195c1333df23d2cddb62b09133e8f763223816) 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 6e71e20000..a00c3c0f67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -196,7 +196,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.21 +ARG CONTAINERD_VERSION=v1.7.22 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 9d0427fe71..04458863e0 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -164,7 +164,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ARG GO_VERSION=1.22.7 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 -ARG CONTAINERD_VERSION=v1.7.21 +ARG CONTAINERD_VERSION=v1.7.22 # 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 a549bd317c..cc6b6b0d68 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.21}" +: "${CONTAINERD_VERSION:=v1.7.22}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION"