Merge pull request #2671 from AkihiroSuda/dev

update containerd (1.7.10)
containerd · Nov 30, 2023 · 4692b3e · 4692b3e
2 parents 73762fc + 0e73e3e
commit 4692b3e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -77,11 +77,11 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.24
+            containerd: v1.6.25
           - ubuntu: 20.04
-            containerd: v1.7.9
+            containerd: v1.7.10
           - ubuntu: 22.04
-            containerd: v1.7.9
+            containerd: v1.7.10
           - ubuntu: 22.04
             containerd: main
     env:
@@ -113,7 +113,7 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 22.04
-            containerd: v1.7.9
+            containerd: v1.7.10
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -157,25 +157,25 @@ jobs:
         # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.24
+            containerd: v1.6.25
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.9
+            containerd: v1.7.10
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.9
+            containerd: v1.7.10
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.6.24
+            containerd: v1.6.25
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.9
+            containerd: v1.7.10
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.9
+            containerd: v1.7.10
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
             containerd: main
@@ -267,15 +267,15 @@ jobs:
       - uses: actions/checkout@v4.1.1
         with:
           repository: containerd/containerd
-          ref: v1.7.9
+          ref: v1.7.10
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
         working-directory: containerd
         run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
       - name: "Set up containerd"
         env:
-          ctrdVersion: 1.7.9
+          ctrdVersion: 1.7.10
         run: powershell hack/configure-windows-ci.ps1
       # TODO: Run unit tests
       - name: "Run integration tests"

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.9
+ARG CONTAINERD_VERSION=v1.7.10
 ARG RUNC_VERSION=v1.1.10
 ARG CNI_PLUGINS_VERSION=v1.3.0