Merge pull request #2422 from crosbymichael/ctr-delete

Add cio.Load for loading io set
This commit is contained in:
Michael Crosby
2018-06-27 08:46:18 -04:00
committed by GitHub
4 changed files with 22 additions and 6 deletions

View File

@@ -25,6 +25,7 @@ import (
"text/tabwriter"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/cmd/ctr/commands/run"
"github.com/containerd/containerd/log"
@@ -162,7 +163,6 @@ var deleteCommand = cli.Command{
log.G(ctx).WithError(err).Errorf("failed to delete container %q", arg)
}
}
return exitErr
},
}
@@ -172,7 +172,7 @@ func deleteContainer(ctx context.Context, client *containerd.Client, id string,
if err != nil {
return err
}
task, err := container.Task(ctx, nil)
task, err := container.Task(ctx, cio.Load)
if err != nil {
return container.Delete(ctx, opts...)
}