Runtime v2 absolute shim path to executable

jterry75 · jterry75 · commit 9f13b74f4a8a · 2018-07-31T15:07:55.000-07:00
Fixes an issue where the runtime v2 was not using an absolute path to
the executable but setting the .Dir field on the exec.Cmd. This causes
the executable to need to be relative to .Dir but no shim is actually
copied to the bundle directory that its work dir is set to.

Signed-off-by: Justin Terry (VM) &lt;juterry@microsoft.com&gt;
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -49,14 +49,20 @@ func Command(ctx context.Context, runtime, containerdAddress, path string, cmdAr
 	}
 	args = append(args, cmdArgs...)
 	name := BinaryName(runtime)
-	if _, err := exec.LookPath(name); err != nil {
-		if eerr, ok := err.(*exec.Error); ok {
+	var cmdPath string
+	var lerr error
+	if cmdPath, lerr = exec.LookPath(name); lerr != nil {
+		if eerr, ok := lerr.(*exec.Error); ok {
 			if eerr.Err == exec.ErrNotFound {
 				return nil, errors.Wrapf(os.ErrNotExist, "runtime %q binary not installed %q", runtime, name)
 			}
 		}
 	}
-	cmd := exec.Command(name, args...)
+	cmdPath, err = filepath.Abs(cmdPath)
+	if err != nil {
+		return nil, err
+	}
+	cmd := exec.Command(cmdPath, args...)
 	cmd.Dir = path
 	cmd.Env = append(os.Environ(), "GOMAXPROCS=2")
 	cmd.SysProcAttr = getSysProcAttr()

Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,20 @@ func Command(ctx context.Context, runtime, containerdAddress, path string, cmdAr`
`49`	`49`	`}`
`50`	`50`	`args = append(args, cmdArgs...)`
`51`	`51`	`name := BinaryName(runtime)`
`52`		`- if _, err := exec.LookPath(name); err != nil {`
`53`		`- if eerr, ok := err.(*exec.Error); ok {`
	`52`	`+ var cmdPath string`
	`53`	`+ var lerr error`
	`54`	`+ if cmdPath, lerr = exec.LookPath(name); lerr != nil {`
	`55`	`+ if eerr, ok := lerr.(*exec.Error); ok {`
`54`	`56`	`if eerr.Err == exec.ErrNotFound {`
`55`	`57`	`return nil, errors.Wrapf(os.ErrNotExist, "runtime %q binary not installed %q", runtime, name)`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`	`}`
`59`		`- cmd := exec.Command(name, args...)`
	`61`	`+ cmdPath, err = filepath.Abs(cmdPath)`
	`62`	`+ if err != nil {`
	`63`	`+ return nil, err`
	`64`	`+ }`
	`65`	`+ cmd := exec.Command(cmdPath, args...)`
`60`	`66`	`cmd.Dir = path`
`61`	`67`	`cmd.Env = append(os.Environ(), "GOMAXPROCS=2")`
`62`	`68`	`cmd.SysProcAttr = getSysProcAttr()`