ctr: add --cgroup for oci.WithCgroup

AkihiroSuda · AkihiroSuda · commit dd0539b0955a · 2018-11-06T17:39:30.000+09:00
Signed-off-by: Akihiro Suda &lt;suda.akihiro@lab.ntt.co.jp&gt;
diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go
@@ -110,6 +110,10 @@ var Command = cli.Command{
 			Name:  "isolated",
 			Usage: "run the container with vm isolation",
 		},
+		cli.StringFlag{
+			Name:  "cgroup",
+			Usage: "cgroup path (To disable use of cgroup, set to \"\" explicitly)",
+		},
 	}, append(commands.SnapshotterFlags, commands.ContainerFlags...)...),
 	Action: func(context *cli.Context) error {
 		var (
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -141,6 +141,10 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 		if context.IsSet("allow-new-privs") {
 			opts = append(opts, oci.WithNewPrivileges)
 		}
+		if context.IsSet("cgroup") {
+			// NOTE: can be set to "" explicitly for disabling cgroup.
+			opts = append(opts, oci.WithCgroup(context.String("cgroup")))
+		}
 	}
 
 	cOpts = append(cOpts, containerd.WithRuntime(context.String("runtime"), nil))

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,10 @@ func NewContainer(ctx gocontext.Context, client containerd.Client, context cli`
`141`	`141`	`if context.IsSet("allow-new-privs") {`
`142`	`142`	`opts = append(opts, oci.WithNewPrivileges)`
`143`	`143`	`}`
	`144`	`+ if context.IsSet("cgroup") {`
	`145`	`+ // NOTE: can be set to "" explicitly for disabling cgroup.`
	`146`	`+ opts = append(opts, oci.WithCgroup(context.String("cgroup")))`
	`147`	`+ }`
`144`	`148`	`}`
`145`	`149`
`146`	`150`	`cOpts = append(cOpts, containerd.WithRuntime(context.String("runtime"), nil))`