github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Allow the shim binary to be specified

Browse Source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure
2017-05-10 15:12:50 -07:00
parent ac5563a809
commit 0457b13043
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux/shim.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/pkg/errors"
)
func newShim(path string, remote bool) (shim.ShimClient, error) {
func newShim(shimName string, path string, remote bool) (shim.ShimClient, error) {
if !remote {
return localShim.Client(path)
}
@@ -31,7 +31,7 @@ func newShim(path string, remote bool) (shim.ShimClient, error) {
if err != nil {
return nil, err
}
cmd := exec.Command("containerd-shim")
cmd := exec.Command(shimName)
cmd.Dir = path
f, err := l.(*net.UnixListener).File()
if err != nil {