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

Merge pull request #4122 from bergwolf/runtimeopts

Browse Source 
ctr: do not assume runc options by default
This commit is contained in:
Phil Estes 2020-03-24 11:10:43 -04:00 committed by GitHub
commit e0d4208f7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,24 +205,9 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
} }
} }
runtimeOpts := &options.Options{} runtimeOpts, err := getRuntimeOptions(context)
if runcBinary := context.String("runc-binary"); runcBinary != "" { if err != nil {
if context.String("runtime") == "io.containerd.runc.v2" { return nil, err
runtimeOpts.BinaryName = runcBinary
} else {
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))
@ -237,6 +222,36 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
return client.NewContainer(ctx, id, cOpts...) return client.NewContainer(ctx, id, cOpts...)
} }
func getRuncOptions(context *cli.Context) (*options.Options, error) {
runtimeOpts := &options.Options{}
if runcBinary := context.String("runc-binary"); runcBinary != "" {
runtimeOpts.BinaryName = runcBinary
}
if context.Bool("runc-systemd-cgroup") {
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
}
return runtimeOpts, nil
}
func getRuntimeOptions(context *cli.Context) (interface{}, error) {
// validate first
if (context.String("runc-binary") != "" || context.Bool("runc-systemd-cgroup")) &&
context.String("runtime") != "io.containerd.runc.v2" {
return nil, errors.New("specifying runc-binary and runc-systemd-cgroup is only supported for \"io.containerd.runc.v2\" runtime")
}
if context.String("runtime") == "io.containerd.runc.v2" {
return getRuncOptions(context)
}
return nil, nil
}
func getNewTaskOpts(context *cli.Context) []containerd.NewTaskOpts { func getNewTaskOpts(context *cli.Context) []containerd.NewTaskOpts {
var ( var (
tOpts []containerd.NewTaskOpts tOpts []containerd.NewTaskOpts