From c51a262e349e2bf317919163634a753ae68adf18 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 9 Dec 2023 01:25:57 +0100 Subject: [PATCH 1/2] update containerd binary to 1.7.10 - full diff: https://github.com/containerd/containerd/compare/v1.7.9...v1.7.10 - release notes: https://github.com/containerd/containerd/releases/tag/v1.7.10 Welcome to the v1.7.10 release of containerd! The tenth patch release for containerd 1.7 contains various fixes and updates. Notable Updates - Enhance container image unpack client logs - cri: fix using the pinned label to pin image - fix: ImagePull should close http connection if there is no available data to read. 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 bacfeb70c70f5..3c23d66614b44 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.9 +ARG CONTAINERD_VERSION=v1.7.10 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 bcf9a86a8eebb..886ac2cf04b55 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -164,7 +164,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ARG GO_VERSION=1.21.5 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 -ARG CONTAINERD_VERSION=v1.7.9 +ARG CONTAINERD_VERSION=v1.7.10 # 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 860366e8be79f..f5710aed27cb2 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.9}" +: "${CONTAINERD_VERSION:=v1.7.10}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION" From 33d2ec08ba8c86a308b9c561cbad0fb52fd1ab09 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 9 Dec 2023 01:26:44 +0100 Subject: [PATCH 2/2] update containerd binary to 1.7.11 - full diff: https://github.com/containerd/containerd/compare/v1.7.10...v1.7.11 - release notes: https://github.com/containerd/containerd/releases/tag/v1.7.11 Welcome to the v1.7.11 release of containerd! The eleventh patch release for containerd 1.7 contains various fixes and updates including one security issue. Notable Updates - Fix Windows default path overwrite issue - Update push to always inherit distribution sources from parent - Update shim to use net dial for gRPC shim sockets - Fix otel version incompatibility - Fix Windows snapshotter blocking snapshot GC on remove failure - Mask /sys/devices/virtual/powercap path in runtime spec and deny in default apparmor profile [GHSA-7ww5-4wqc-m92c] Deprecation Warnings - Emit deprecation warning for AUFS snapshotter - Emit deprecation warning for v1 runtime - Emit deprecation warning for deprecated CRI configs - Emit deprecation warning for CRI v1alpha1 usage - Emit deprecation warning for CRIU config in CRI 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 3c23d66614b44..fbe1df2037df5 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.10 +ARG CONTAINERD_VERSION=v1.7.11 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 886ac2cf04b55..01f26a5071bfd 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -164,7 +164,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ARG GO_VERSION=1.21.5 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 -ARG CONTAINERD_VERSION=v1.7.10 +ARG CONTAINERD_VERSION=v1.7.11 # 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 f5710aed27cb2..35ee968e056ad 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.10}" +: "${CONTAINERD_VERSION:=v1.7.11}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION"