containerd: add runtime crun

labring-actions · Apr 26, 2024 · 5344181 · 5344181
1 parent 3590958
commit 5344181
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/containerd/etc/config.toml.tmpl b/containerd/etc/config.toml.tmpl
@@ -34,10 +34,13 @@ oom_score = 0
       [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
         [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
           runtime_type = "io.containerd.runc.v2"
-          runtime_engine = ""
-          runtime_root = ""
           [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
             SystemdCgroup = true
+        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.crun]
+          runtime_type = "io.containerd.runc.v2"
+          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.crun.options]
+            BinaryName = "/usr/bin/crun"
+            SystemdCgroup = true
     [plugins."io.containerd.grpc.v1.cri".registry]
       config_path = "/etc/containerd/certs.d"
       [plugins."io.containerd.grpc.v1.cri".registry.configs]

diff --git a/containerd/scripts/check.sh b/containerd/scripts/check.sh
@@ -27,4 +27,8 @@ if ! command_exists apparmor_parser; then
   sed -i 's/disable_apparmor = false/disable_apparmor = true/g' ../etc/config.toml
   warn "Replace disable_apparmor = false to disable_apparmor = true"
 fi
+if /usr/bin/crun_ --version 2>/dev/null | grep ^crun; then
+  cp -au /usr/bin/.crun /usr/bin/crun
+  sed -i -E 's~default_runtime_name = ".+"~default_runtime_name = "crun"~' ../etc/config.toml
+fi
 logger "check root,port,cri success"