diff --git a/containerd-shim/process.go b/containerd-shim/process.go index 7037170..1b955ad 100644 --- a/containerd-shim/process.go +++ b/containerd-shim/process.go @@ -82,9 +82,7 @@ func (p *process) start() error { if err != nil { return err } - args := []string{ - "--id", p.id, - } + args := []string{} if p.exec { args = append(args, "exec", "--process", filepath.Join(cwd, "process.json"), @@ -115,6 +113,7 @@ func (p *process) start() error { args = append(args, "-d", "--pid-file", filepath.Join(cwd, "pid"), + p.id, ) cmd := exec.Command("runc", args...) cmd.Dir = p.bundle @@ -148,7 +147,7 @@ func (p *process) pid() int { func (p *process) delete() error { if !p.exec { - return exec.Command("runc", "--id", p.id, "delete").Run() + return exec.Command("runc", "delete", p.id).Run() } return nil } diff --git a/runtime/container.go b/runtime/container.go index 7f5f08c..aa0d6b5 100644 --- a/runtime/container.go +++ b/runtime/container.go @@ -216,11 +216,11 @@ func (c *container) readSpec() (*specs.LinuxSpec, error) { } func (c *container) Pause() error { - return exec.Command("runc", "--id", c.id, "pause").Run() + return exec.Command("runc", "pause", c.id).Run() } func (c *container) Resume() error { - return exec.Command("runc", "--id", c.id, "resume").Run() + return exec.Command("runc", "resume", c.id).Run() } func (c *container) State() State { @@ -287,7 +287,6 @@ func (c *container) Checkpoint(cpt Checkpoint) error { return err } args := []string{ - "--id", c.id, "checkpoint", "--image-path", path, } @@ -306,6 +305,7 @@ func (c *container) Checkpoint(cpt Checkpoint) error { if cpt.UnixSockets { add("--ext-unix-sk") } + add(c.id) return exec.Command("runc", args...).Run() }