Fix the --runtime option of container create is ignored

Signed-off-by: Kay Yan <[email protected]>

Author: yankay

cmd/nerdctl/compose_up_test.go

@@ -46,10 +46,10 @@ services:
 	c := base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d")
 	expected := icmd.Expected{
 		ExitCode: 1,
-		Err:      `exec: \"invalid\": executable file not found in $PATH`,
+		Err:      `failed to resolve runtime path: invalid runtime name invalid`,
 	}
 	if base.Target == testutil.Docker {
-		expected.Err = `Unknown runtime specified invalid`
+		expected.Err = `unknown or invalid runtime name: invalid`
 	}
 	c.Assert(expected)
 }

pkg/cmd/container/run_runtime.go

@@ -39,8 +39,8 @@ func generateRuntimeCOpts(cgroupManager, runtimeStr string) ([]containerd.NewCon
 		runcOpts.SystemdCgroup = true
 	}
 	if runtimeStr != "" {
+		runtime = runtimeStr
 		if strings.HasPrefix(runtimeStr, "io.containerd.") || runtimeStr == "wtf.sbk.runj.v1" {
-			runtime = runtimeStr
 			if !strings.HasPrefix(runtimeStr, "io.containerd.runc.") {
 				if cgroupManager == "systemd" {
 					logrus.Warnf("cannot set cgroup manager to %q for runtime %q", cgroupManager, runtimeStr)