Merge pull request #6021 from dmcgowan/runc-shim-plugin

2021-12-14 10:19:23 +08:00
parent ac531108ab f83ab813d2
commit d47fa40d1b
7 changed files with 1217 additions and 843 deletions
--- a/cmd/containerd-shim-runc-v2/main.go
+++ b/cmd/containerd-shim-runc-v2/main.go
@@ -20,10 +20,13 @@
 package main

 import (
-	v2 "github.com/containerd/containerd/runtime/v2/runc/v2"
+	"context"
+
+	"github.com/containerd/containerd/runtime/v2/runc/manager"
+	_ "github.com/containerd/containerd/runtime/v2/runc/task/plugin"
 	"github.com/containerd/containerd/runtime/v2/shim"
 )

 func main() {
-	shim.Run("io.containerd.runc.v2", v2.New)
+	shim.RunManager(context.Background(), manager.NewShimManager("io.containerd.runc.v2"))
 }