github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr: allow specifying --runc-systemd-cgroup

Browse Source 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2019-11-05 16:59:13 +09:00
parent 7f5d900769
commit 8f74de9e9e
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/ctr/commands/run/run_unix.go
View File

@ -40,6 +40,10 @@ var platformRunFlags = []cli.Flag{
Name: "runc-binary", Name: "runc-binary",
Usage: "specify runc-compatible binary", Usage: "specify runc-compatible binary",
}, },
cli.BoolFlag{
Name: "runc-systemd-cgroup",
Usage: "start runc with systemd cgroup manager",
},
} }
// NewContainer creates a new container // NewContainer creates a new container
@ -181,6 +185,17 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
return nil, errors.New("specifying runc-binary is only supported for \"io.containerd.runc.v2\" runtime") return nil, errors.New("specifying runc-binary is only supported for \"io.containerd.runc.v2\" runtime")
} }
} }
if context.Bool("runc-systemd-cgroup") {
if context.String("runtime") == "io.containerd.runc.v2" {
if context.String("cgroup") == "" {
// runc maps "machine.slice:foo:deadbeef" to "/machine.slice/foo-deadbeef.scope"
return nil, errors.New("option --runc-systemd-cgroup requires --cgroup to be set, e.g. \"machine.slice:foo:deadbeef\"")
}
runtimeOpts.SystemdCgroup = true
} else {
return nil, errors.New("specifying runc-systemd-cgroup is only supported for \"io.containerd.runc.v2\" runtime")
}
}
cOpts = append(cOpts, containerd.WithRuntime(context.String("runtime"), runtimeOpts)) cOpts = append(cOpts, containerd.WithRuntime(context.String("runtime"), runtimeOpts))
opts = append(opts, oci.WithAnnotations(commands.LabelArgs(context.StringSlice("label")))) opts = append(opts, oci.WithAnnotations(commands.LabelArgs(context.StringSlice("label"))))