From 03c9de576608c72b73f9b559d1cb82f4859a2d88 Mon Sep 17 00:00:00 2001 From: apostasie Date: Tue, 1 Oct 2024 17:25:23 -0700 Subject: [PATCH] Update to containerd 2 rc.5 Signed-off-by: apostasie --- .github/workflows/test.yml | 6 +++--- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1936fb6885e..06c04a9685d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,10 +69,10 @@ jobs: containerd: v1.7.19 runner: "ubuntu-22.04" - ubuntu: 24.04 - containerd: v2.0.0-rc.4 + containerd: v2.0.0-rc.5 runner: "ubuntu-24.04" - ubuntu: 24.04 - containerd: v2.0.0-rc.4 + containerd: v2.0.0-rc.5 runner: github-arm64-2c-8gb env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" @@ -179,7 +179,7 @@ jobs: rootlesskit: v2.3.1 target: test-integration-rootless - ubuntu: 24.04 - containerd: v2.0.0-rc.4 + containerd: v2.0.0-rc.5 rootlesskit: v2.3.1 target: test-integration-rootless - ubuntu: 24.04 diff --git a/Dockerfile b/Dockerfile index 36ff9c41381..dcd8e5995ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v2.0.0-rc.4 +ARG CONTAINERD_VERSION=v2.0.0-rc.5 ARG RUNC_VERSION=v1.1.14 ARG CNI_PLUGINS_VERSION=v1.5.1