From fda3acd7a68d4d31c47461aa7cb7b1503ffed01e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 12 Jan 2024 17:56:37 +0100 Subject: [PATCH] update containerd binary to v1.7.12 - full diff: https://github.com/containerd/containerd/compare/v1.7.11...v1.7.12 - release notes: https://github.com/containerd/containerd/releases/tag/v1.7.12 Welcome to the v1.7.12 release of containerd! The twelfth patch release for containerd 1.7 contains various fixes and updates. Notable Updates - Fix on dialer function for Windows - Improve `/etc/group` handling when appending groups - Update shim pidfile permissions to 0644 - Update runc binary to v1.1.11 - Allow import and export to reference missing content - Remove runc import - Update Go version to 1.20.13 Deprecation Warnings - Emit deprecation warning for `containerd.io/restart.logpath` label usage Signed-off-by: Sebastiaan van Stijn (cherry picked from commit cd1709b0d400e726629666a781e4e21c5197ec1f) 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 1be2632bc6..2b86f49f4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -197,7 +197,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.11 +ARG CONTAINERD_VERSION=v1.7.12 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 6fb44b4ec2..7d0f35254f 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ARG GO_VERSION=1.20.12 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 -ARG CONTAINERD_VERSION=v1.7.11 +ARG CONTAINERD_VERSION=v1.7.12 # 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 35ee968e05..6896181a77 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.11}" +: "${CONTAINERD_VERSION:=v1.7.12}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION"