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

Merge pull request #169 from mlaventure/fix-runtime-root

Browse source 
Ensure that --root is passed to oci when using runtime args
This commit is contained in:
Michael Crosby 2016-03-29 10:45:12 -07:00
commit aa976325f5
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
runtime/container.go
View file

@ -206,7 +206,11 @@ func (c *container) readSpec() (*specs.Spec, error) {
func (c *container) Delete() error { func (c *container) Delete() error {
err := os.RemoveAll(filepath.Join(c.root, c.id)) err := os.RemoveAll(filepath.Join(c.root, c.id))
exec.Command(c.runtime, "delete", c.id).Run()
args := c.runtimeArgs
args = append(args, "delete", c.id)
exec.Command(c.runtime, args...).Run()
return err return err
} }

9
runtime/container_linux.go
View file

@ -51,11 +51,15 @@ func (c *container) Runtime() string {
} }
func (c *container) Pause() error { func (c *container) Pause() error {
return exec.Command(c.runtime, "pause", c.id).Run() args := c.runtimeArgs
args = append(args, "pause", c.id)
return exec.Command(c.runtime, args...).Run()
} }
func (c *container) Resume() error { func (c *container) Resume() error {
return exec.Command(c.runtime, "resume", c.id).Run() args := c.runtimeArgs
args = append(args, "resume", c.id)
return exec.Command(c.runtime, args...).Run()
} }
func (c *container) Checkpoints() ([]Checkpoint, error) { func (c *container) Checkpoints() ([]Checkpoint, error) {
@ -107,6 +111,7 @@ func (c *container) Checkpoint(cpt Checkpoint) error {
add := func(flags ...string) { add := func(flags ...string) {
args = append(args, flags...) args = append(args, flags...)
} }
add(c.runtimeArgs...)
if !cpt.Exit { if !cpt.Exit {
add("--leave-running") add("--leave-running")
} }