Fix the --runtime option of container create is ignored

yankay · yankay · commit 9bbe3ea68afc · 2023-08-07T17:09:32.000Z
Signed-off-by: Kay Yan &lt;kay.yan@daocloud.io&gt;
diff --git a/pkg/cmd/container/run_runtime.go b/pkg/cmd/container/run_runtime.go
@@ -18,6 +18,7 @@ package container
 
 import (
 	"context"
+	"path/filepath"
 	"strings"
 
 	"github.com/containerd/containerd"
@@ -47,9 +48,9 @@ func generateRuntimeCOpts(cgroupManager, runtimeStr string) ([]containerd.NewCon
 				}
 				runtimeOpts = nil
 			}
-		} else {
+		} else if filepath.IsAbs(runtimeStr) {
 			// runtimeStr is a runc binary
-			runcOpts.BinaryName = runtimeStr
+			runtime = runtimeStr
 		}
 	}
 	o := containerd.WithRuntime(runtime, runtimeOpts)

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package container`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+ "path/filepath"`
`21`	`22`	`"strings"`
`22`	`23`
`23`	`24`	`"github.com/containerd/containerd"`
`@@ -47,9 +48,9 @@ func generateRuntimeCOpts(cgroupManager, runtimeStr string) ([]containerd.NewCon`
`47`	`48`	`}`
`48`	`49`	`runtimeOpts = nil`
`49`	`50`	`}`
`50`		`- } else {`
	`51`	`+ } else if filepath.IsAbs(runtimeStr) {`
`51`	`52`	`// runtimeStr is a runc binary`
`52`		`- runcOpts.BinaryName = runtimeStr`
	`53`	`+ runtime = runtimeStr`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`o := containerd.WithRuntime(runtime, runtimeOpts)`