Merge pull request #2960 from jterry75/shim_windows_lookpath

crosbymichael · web-flow · commit f35c3527b24b · 2019-01-28T16:26:12.000-05:00
Add support for containerd shim activation's within the same folder not in PATH
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -31,8 +31,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-const shimBinaryFormat = "containerd-shim-%s-%s"
-
 var runtimePaths sync.Map
 
 // Command returns the shim command with the provided args and configuration
@@ -65,7 +63,19 @@ func Command(ctx context.Context, runtime, containerdAddress, path string, cmdAr
 		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)
+					// LookPath only finds current directory matches based on
+					// the callers current directory but the caller is not
+					// likely in the same directory as the containerd
+					// executables. Instead match the calling binaries path
+					// (containerd) and see if they are side by side. If so
+					// execute the shim found there.
+					testPath := filepath.Join(filepath.Dir(self), name)
+					if _, serr := os.Stat(testPath); serr == nil {
+						path = testPath
+					}
+					if path == "" {
+						return nil, errors.Wrapf(os.ErrNotExist, "runtime %q binary not installed %q", runtime, name)
+					}
 				}
 			}
 		}
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
@@ -31,6 +31,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+const shimBinaryFormat = "containerd-shim-%s-%s"
+
 func getSysProcAttr() *syscall.SysProcAttr {
 	return &syscall.SysProcAttr{
 		Setpgid: true,
diff --git a/runtime/v2/shim/util_windows.go b/runtime/v2/shim/util_windows.go
@@ -29,6 +29,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+const shimBinaryFormat = "containerd-shim-%s-%s.exe"
+
 func getSysProcAttr() *syscall.SysProcAttr {
 	return nil
 }
diff --git a/vendor.conf b/vendor.conf
@@ -33,7 +33,7 @@ golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
 github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
 github.com/Microsoft/go-winio v0.4.11
-github.com/Microsoft/hcsshim v0.8.4
+github.com/Microsoft/hcsshim v0.8.5
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
 github.com/containerd/ttrpc f02858b1457c5ca3aaec3a0803eb0d59f96e41d6
diff --git a/vendor/github.com/Microsoft/hcsshim/pkg/go-runhcs/runhcs.go b/vendor/github.com/Microsoft/hcsshim/pkg/go-runhcs/runhcs.go

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ import (`
`31`	`31`	`"github.com/pkg/errors"`
`32`	`32`	`)`
`33`	`33`
	`34`	`+const shimBinaryFormat = "containerd-shim-%s-%s"`
	`35`	`+`
`34`	`36`	`func getSysProcAttr() *syscall.SysProcAttr {`
`35`	`37`	`return &syscall.SysProcAttr{`
`36`	`38`	`Setpgid: true,`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ import (`
`29`	`29`	`"github.com/pkg/errors"`
`30`	`30`	`)`
`31`	`31`
	`32`	`+const shimBinaryFormat = "containerd-shim-%s-%s.exe"`
	`33`	`+`
`32`	`34`	`func getSysProcAttr() *syscall.SysProcAttr {`
`33`	`35`	`return nil`
`34`	`36`	`}`