update containerd binary to v1.7.18 Update the containerd binary that's used in CI and for the static packages. - release notes: https://github.com/containerd/containerd/releases/tag/v1.7.18 - full diff: https://github.com/containerd/containerd/compare/v1.7.17...v1.7.18 Welcome to the v1.7.18 release of containerd! The eighteenth patch release for containerd 1.7 contains various updates along with an updated version of Go. Go 1.22.4 and 1.21.11 include a fix for a symlink time of check to time of use race condition during directory removal. Highlights - Update Go version to 1.21.11 - Remove uses of platforms.Platform alias - Migrate log imports to github.com/containerd/log - Migrate errdefs package to github.com/containerd/errdefs - Fix usage of "unknown" platform Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 5318c38eae6c62edd7e9a99c096f71248afb3baa) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/Dockerfile b/Dockerfile index c019aec..3f167b6 100644 --- a/Dockerfile +++ b/Dockerfile
@@ -196,7 +196,7 @@ # 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.17 +ARG CONTAINERD_VERSION=v1.7.18 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 cf44be0..af6c4b0 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows
@@ -164,7 +164,7 @@ ARG GO_VERSION=1.21.11 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.1 -ARG CONTAINERD_VERSION=v1.7.17 +ARG CONTAINERD_VERSION=v1.7.18 # 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 8afb1b3..4362ade 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer
@@ -15,7 +15,7 @@ # 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.17}" +: "${CONTAINERD_VERSION:=v1.7.18}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION"