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

Merge pull request #1099 from dmcgowan/fix-ctr-delete-snapshot

Browse Source 
Fix ctr delete to remove snapshot
This commit is contained in:
Michael Crosby 2017-06-26 14:37:31 -07:00 committed by GitHub
commit 1f478be14d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ctr/delete.go
View File

@ -11,6 +11,12 @@ var deleteCommand = cli.Command{
Name: "delete", Name: "delete",
Usage: "delete an existing container", Usage: "delete an existing container",
ArgsUsage: "CONTAINER", ArgsUsage: "CONTAINER",
Flags: []cli.Flag{
cli.BoolFlag{
Name: "keep-snapshot",
Usage: "do not clean up snapshot with container",
},
},
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
ctx, cancel := appContext(context) ctx, cancel := appContext(context)
defer cancel() defer cancel()
@ -18,13 +24,17 @@ var deleteCommand = cli.Command{
if err != nil { if err != nil {
return err return err
} }
deleteOpts := []containerd.DeleteOpts{}
if !context.Bool("keep-snapshot") {
deleteOpts = append(deleteOpts, containerd.WithRootFSDeletion)
}
container, err := client.LoadContainer(ctx, context.Args().First()) container, err := client.LoadContainer(ctx, context.Args().First())
if err != nil { if err != nil {
return err return err
} }
task, err := container.Task(ctx, nil) task, err := container.Task(ctx, nil)
if err != nil { if err != nil {
return container.Delete(ctx) return container.Delete(ctx, deleteOpts...)
} }
status, err := task.Status(ctx) status, err := task.Status(ctx)
if err != nil { if err != nil {
@ -34,7 +44,7 @@ var deleteCommand = cli.Command{
if _, err := task.Delete(ctx); err != nil { if _, err := task.Delete(ctx); err != nil {
return err return err
} }
return container.Delete(ctx) return container.Delete(ctx, deleteOpts...)
} }
return fmt.Errorf("cannot delete a container with an existing task") return fmt.Errorf("cannot delete a container with an existing task")
}, },