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

ctr: Add sandbox flag to ctr run

Browse Source 
Add a flag to be able to run a container in a given sandbox.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2023-04-18 11:21:31 -07:00
parent 290a800e83
commit 519457e3e0
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/commands/commands.go
View File

@ -141,6 +141,10 @@ var (
Usage: "Runtime name or absolute path to runtime binary", Usage: "Runtime name or absolute path to runtime binary",
Value: defaults.DefaultRuntime, Value: defaults.DefaultRuntime,
}, },
cli.StringFlag{
Name: "sandbox",
Usage: "Create the container in the given sandbox",
},
cli.StringFlag{ cli.StringFlag{
Name: "runtime-config-path", Name: "runtime-config-path",
Usage: "Optional runtime config path", Usage: "Optional runtime config path",

1
cmd/ctr/commands/run/run.go
View File

@ -164,6 +164,7 @@ var Command = cli.Command{
return err return err
} }
defer cancel() defer cancel()
container, err := NewContainer(ctx, client, context) container, err := NewContainer(ctx, client, context)
if err != nil { if err != nil {
return err return err

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

@ -102,6 +102,10 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
spec containerd.NewContainerOpts spec containerd.NewContainerOpts
) )
if sandbox := context.String("sandbox"); sandbox != "" {
cOpts = append(cOpts, containerd.WithSandbox(sandbox))
}
if config { if config {
cOpts = append(cOpts, containerd.WithContainerLabels(commands.LabelArgs(context.StringSlice("label")))) cOpts = append(cOpts, containerd.WithContainerLabels(commands.LabelArgs(context.StringSlice("label"))))
opts = append(opts, oci.WithSpecFromFile(context.String("config"))) opts = append(opts, oci.WithSpecFromFile(context.String("config")))

4
cmd/ctr/commands/run/run_windows.go
View File

@ -51,6 +51,10 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
config = context.IsSet("config") config = context.IsSet("config")
) )
if sandbox := context.String("sandbox"); sandbox != "" {
cOpts = append(cOpts, containerd.WithSandbox(sandbox))
}
if config { if config {
id = context.Args().First() id = context.Args().First()
opts = append(opts, oci.WithSpecFromFile(context.String("config"))) opts = append(opts, oci.WithSpecFromFile(context.String("config")))