vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #619 from crosbymichael/no-shim

Browse source 
Add `no_shim` config for not running with a shim
This commit is contained in:
Michael Crosby 2017-03-22 13:49:03 -07:00 • committed by GitHub
commit 5e5479718c
9 changed files with 199 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

11
linux/shim/exec.go
View file

@ -26,22 +26,19 @@ type execProcess struct {
parent *initProcess
}
func newExecProcess(context context.Context, r *shimapi.ExecRequest, parent *initProcess, id int) (process, error) {
cwd, err := os.Getwd()
if err != nil {
return nil, err
}
func newExecProcess(context context.Context, path string, r *shimapi.ExecRequest, parent *initProcess, id int) (process, error) {
e := &execProcess{
id: id,
parent: parent,
}
var (
err error
socket *runc.ConsoleSocket
io runc.IO
pidfile = filepath.Join(cwd, fmt.Sprintf("%d.pid", id))
pidfile = filepath.Join(path, fmt.Sprintf("%d.pid", id))
)
if r.Terminal {
if socket, err = runc.NewConsoleSocket(filepath.Join(cwd, "pty.sock")); err != nil {
if socket, err = runc.NewConsoleSocket(filepath.Join(path, "pty.sock")); err != nil {
return nil, err
}
defer os.Remove(socket.Path())