Relax --runtime restrictions

Signed-off-by: apostasie <[email protected]>

Author: apostasie

cmd/nerdctl/compose/compose_up_test.go

@@ -27,7 +27,6 @@ import (
 	"gotest.tools/v3/icmd"
 
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
-	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
 
 // https://github.com/containerd/nerdctl/issues/1942
@@ -48,11 +47,7 @@ services:
 	c := base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d")
 	expected := icmd.Expected{
 		ExitCode: 1,
-		Err:      `exec: \"invalid\": executable file not found in $PATH`,
-	}
-	// Docker expected err is different
-	if nerdtest.IsDocker() {
-		expected.Err = `unknown or invalid runtime name: invalid`
+		Err:      `invalid runtime name`,
 	}
 	c.Assert(expected)
 }

pkg/cmd/container/run_runtime.go

@@ -18,6 +18,7 @@ package container
 
 import (
 	"context"
+	"os/exec"
 	"strings"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -49,8 +50,14 @@ func generateRuntimeCOpts(cgroupManager, runtimeStr string) ([]containerd.NewCon
 				runtimeOpts = nil
 			}
 		} else {
-			// runtimeStr is a runc binary
-			runcOpts.BinaryName = runtimeStr
+			// runtimeStr may be a runc binary - check that it exists
+			// if it does not, treat it as a runtime
+			ex, err := exec.LookPath(runtimeStr)
+			if err != nil {
+				runtime = runtimeStr
+			} else {
+				runcOpts.BinaryName = ex
+			}
 		}
 	}
 	o := containerd.WithRuntime(runtime, runtimeOpts)