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

client: rename rootfs to snapshot in "With" functions

Browse Source 
Clarify terminology around functions which use and create
snapshots for containers.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2017-07-25 14:36:30 -07:00
parent 9434bf9e8a
commit 73bec3edea
12 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/delete.go
View File

@@ -26,7 +26,7 @@ var deleteCommand = cli.Command{
}
deleteOpts := []containerd.DeleteOpts{}
if !context.Bool("keep-snapshot") {
deleteOpts = append(deleteOpts, containerd.WithRootFSDeletion)
deleteOpts = append(deleteOpts, containerd.WithSnapshotCleanup)
}
container, err := client.LoadContainer(ctx, context.Args().First())
if err != nil {

2
cmd/ctr/run.go
View File

@@ -119,7 +119,7 @@ var runCommand = cli.Command{
return err
}
if context.Bool("rm") {
defer container.Delete(ctx, containerd.WithRootFSDeletion)
defer container.Delete(ctx, containerd.WithSnapshotCleanup)
}
task, err := newTask(ctx, container, checkpointIndex, tty)
if err != nil {

4
cmd/ctr/run_unix.go
View File

@@ -97,9 +97,9 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
}
var rootfs containerd.NewContainerOpts
if context.Bool("readonly") {
rootfs = containerd.WithNewReadonlyRootFS(id, image)
rootfs = containerd.WithNewSnapshotView(id, image)
} else {
rootfs = containerd.WithNewRootFS(id, image)
rootfs = containerd.WithNewSnapshot(id, image)
}
return client.NewContainer(ctx, id,