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

Merge pull request #1101 from estesp/invalid-runtime-command

Browse Source 
Fix incorrect reference to the gRPC runtime name as a binary
This commit is contained in:
Michael Crosby 2017-06-26 16:59:18 -07:00 committed by GitHub
commit f3b85a91b0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/runtime.go
View File

@ -434,7 +434,9 @@ func (r *Runtime) getRuntime(ctx context.Context, ns, id string) (*runc.Runc, er
return nil, err return nil, err
} }
return &runc.Runc{ return &runc.Runc{
Command: c.Runtime.Name, // TODO: until we have a way to store/retrieve the original command
// we can only rely on runc from the default $PATH
Command: runc.DefaultCommand,
LogFormat: runc.JSON, LogFormat: runc.JSON,
PdeathSignal: unix.SIGKILL, PdeathSignal: unix.SIGKILL,
Root: filepath.Join(client.RuncRoot, ns), Root: filepath.Join(client.RuncRoot, ns),