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

Fix bug where snapshots got created with wrong snapshotter

Browse Source 
Snapshotters for run must be created with requested snapshotter.
The order of the options is important to ensure that the snapshotter
is set before the snapshots are created.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2017-08-04 13:32:33 -07:00
parent c8b4e4dbe8
commit 5a74a46d42
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/run_unix.go
View File

@@ -92,12 +92,12 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
} }
opts = append(opts, containerd.WithImageConfig(ctx, image)) opts = append(opts, containerd.WithImageConfig(ctx, image))
cOpts = append(cOpts, containerd.WithImage(image)) cOpts = append(cOpts, containerd.WithImage(image))
cOpts = append(cOpts, containerd.WithSnapshotter(context.String("snapshotter")))
if context.Bool("readonly") { if context.Bool("readonly") {
cOpts = append(cOpts, containerd.WithNewSnapshotView(id, image)) cOpts = append(cOpts, containerd.WithNewSnapshotView(id, image))
} else { } else {
cOpts = append(cOpts, containerd.WithNewSnapshot(id, image)) cOpts = append(cOpts, containerd.WithNewSnapshot(id, image))
} }
cOpts = append(cOpts, containerd.WithSnapshotter(context.String("snapshotter")))
} }
opts = append(opts, withEnv(context), withMounts(context)) opts = append(opts, withEnv(context), withMounts(context))