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

cmd: don't alias context package, and use cliContext for cli.Context

Browse Source 
Unfortunately, this is a rather large diff, but perhaps worth a one-time
"rip off the bandaid" for v2. This patch removes the use of "gocontext"
as alias for stdLib's "context", and uses "cliContext" for uses of
cli.context.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-06-20 02:15:13 +02:00
parent 741c4bde51
commit dd0542f7c1
65 changed files with 754 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/ctr/commands/containers/restore.go
View File

@@ -43,16 +43,16 @@ var restoreCommand = &cli.Command{
Usage: "Restore the runtime and memory data from the checkpoint",
},
},
Action: func(context *cli.Context) error {
id := context.Args().First()
Action: func(cliContext *cli.Context) error {
id := cliContext.Args().First()
if id == "" {
return errors.New("container id must be provided")
}
ref := context.Args().Get(1)
ref := cliContext.Args().Get(1)
if ref == "" {
return errors.New("ref must be provided")
}
client, ctx, cancel, err := commands.NewClient(context)
client, ctx, cancel, err := commands.NewClient(cliContext)
if err != nil {
return err
}
@@ -76,7 +76,7 @@ var restoreCommand = &cli.Command{
containerd.WithRestoreSpec,
containerd.WithRestoreRuntime,
}
if context.Bool("rw") {
if cliContext.Bool("rw") {
opts = append(opts, containerd.WithRestoreRW)
}
@@ -85,7 +85,7 @@ var restoreCommand = &cli.Command{
return err
}
topts := []containerd.NewTaskOpts{}
if context.Bool("live") {
if cliContext.Bool("live") {
topts = append(topts, containerd.WithTaskCheckpoint(checkpoint))
}
spec, err := ctr.Spec(ctx)