Skip to content

Commit

Permalink
ctr sandbox: handle sandbox config
Browse files Browse the repository at this point in the history
"ctr s r" help suggests <pod-config.json> is taken as the first
parameter and the sandbox ID becomes next. However, only the latter
is read and used.

Add code that reads <pod-config.json> and passes it to Sanbox.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
  • Loading branch information
mythi committed May 19, 2022
1 parent 405fba7 commit 900019b
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions cmd/ctr/commands/sandboxes/sandboxes.go
Expand Up @@ -17,6 +17,7 @@
package sandboxes

import (
"encoding/json"
"fmt"
"os"
"text/tabwriter"
Expand Down Expand Up @@ -54,11 +55,24 @@ var runCommand = cli.Command{
},
},
Action: func(context *cli.Context) error {
if context.NArg() != 2 {
return cli.ShowSubcommandHelp(context)
}
var (
id = context.Args().Get(0)
id = context.Args().Get(1)
runtime = context.String("runtime")
)

spec, err := os.ReadFile(context.Args().First())
if err != nil {
return fmt.Errorf("Failed to read sandbox config: %w", err)
}

ociSpec := oci.Spec{}
if err = json.Unmarshal(spec, &ociSpec); err != nil {
return fmt.Errorf("Failed to parse sandbox config: %w", err)
}

client, ctx, cancel, err := commands.NewClient(context)
if err != nil {
return err
Expand All @@ -67,7 +81,7 @@ var runCommand = cli.Command{

sandbox, err := client.NewSandbox(ctx, id,
containerd.WithSandboxRuntime(runtime, nil),
containerd.WithSandboxSpec(&oci.Spec{}),
containerd.WithSandboxSpec(&ociSpec),
)
if err != nil {
return fmt.Errorf("failed to create new sandbox: %w", err)
Expand Down

0 comments on commit 900019b

Please sign in to comment.