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

crosbymichael · crosbymichael · commit aa976325f5bc · 2016-03-29T10:45:12.000-07:00
Ensure that --root is passed to oci when using runtime args
diff --git a/runtime/container.go b/runtime/container.go
@@ -206,7 +206,11 @@ func (c *container) readSpec() (*specs.Spec, error) {
 
 func (c *container) Delete() error {
 	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
 }
 
diff --git a/runtime/container_linux.go b/runtime/container_linux.go
@@ -51,11 +51,15 @@ func (c *container) Runtime() string {
 }
 
 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 {
-	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) {
@@ -107,6 +111,7 @@ func (c *container) Checkpoint(cpt Checkpoint) error {
 	add := func(flags ...string) {
 		args = append(args, flags...)
 	}
+	add(c.runtimeArgs...)
 	if !cpt.Exit {
 		add("--leave-running")
 	}

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,15 @@ func (c *container) Runtime() string {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func (c *container) Pause() error {`
`54`		`- return exec.Command(c.runtime, "pause", c.id).Run()`
	`54`	`+ args := c.runtimeArgs`
	`55`	`+ args = append(args, "pause", c.id)`
	`56`	`+ return exec.Command(c.runtime, args...).Run()`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`func (c *container) Resume() error {`
`58`		`- return exec.Command(c.runtime, "resume", c.id).Run()`
	`60`	`+ args := c.runtimeArgs`
	`61`	`+ args = append(args, "resume", c.id)`
	`62`	`+ return exec.Command(c.runtime, args...).Run()`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`func (c *container) Checkpoints() ([]Checkpoint, error) {`
`@@ -107,6 +111,7 @@ func (c *container) Checkpoint(cpt Checkpoint) error {`
`107`	`111`	`add := func(flags ...string) {`
`108`	`112`	`args = append(args, flags...)`
`109`	`113`	`}`
	`114`	`+ add(c.runtimeArgs...)`
`110`	`115`	`if !cpt.Exit {`
`111`	`116`	`add("--leave-running")`
`112`	`117`	`}`