add support for --rootless

AkihiroSuda · AkihiroSuda · commit 0194529da800 · 2018-07-03T23:47:15.000+09:00
The --rootless flag was introduced in opencontainers/runc#1688. In most cases runc itself can detect the appropriate value, but it is considered to be there are some corner cases. Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
diff --git a/runc.go b/runc.go
@@ -66,6 +66,7 @@ type Runc struct {
 	Setpgid       bool
 	Criu          string
 	SystemdCgroup bool
+	Rootless      *bool // nil stands for "auto"
 }
 
 // List returns all containers created inside the provided runc root directory
@@ -655,6 +656,10 @@ func (r *Runc) args() (out []string) {
 	if r.SystemdCgroup {
 		out = append(out, "--systemd-cgroup")
 	}
+	if r.Rootless != nil {
+		// nil stands for "auto" (differs from explicit "false")
+		out = append(out, "--rootless="+strconv.FormatBool(*r.Rootless))
+	}
 	return out
 }
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ type Runc struct {`
`66`	`66`	`Setpgid bool`
`67`	`67`	`Criu string`
`68`	`68`	`SystemdCgroup bool`
	`69`	`+ Rootless *bool // nil stands for "auto"`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`// List returns all containers created inside the provided runc root directory`
`@@ -655,6 +656,10 @@ func (r *Runc) args() (out []string) {`
`655`	`656`	`if r.SystemdCgroup {`
`656`	`657`	`out = append(out, "--systemd-cgroup")`
`657`	`658`	`}`
	`659`	`+ if r.Rootless != nil {`
	`660`	`+ // nil stands for "auto" (differs from explicit "false")`
	`661`	`+ out = append(out, "--rootless="+strconv.FormatBool(*r.Rootless))`
	`662`	`+ }`
`658`	`663`	`return out`
`659`	`664`	`}`
`660`	`665`