From 5a74a46d423c7ddadf3ff4e7b557ed4452d720a0 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Fri, 4 Aug 2017 13:32:33 -0700 Subject: [PATCH] Fix bug where snapshots got created with wrong snapshotter 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 --- cmd/ctr/run_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/ctr/run_unix.go b/cmd/ctr/run_unix.go index 9ea4906a9..48d458490 100644 --- a/cmd/ctr/run_unix.go +++ b/cmd/ctr/run_unix.go @@ -92,12 +92,12 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli } opts = append(opts, containerd.WithImageConfig(ctx, image)) cOpts = append(cOpts, containerd.WithImage(image)) + cOpts = append(cOpts, containerd.WithSnapshotter(context.String("snapshotter"))) if context.Bool("readonly") { cOpts = append(cOpts, containerd.WithNewSnapshotView(id, image)) } else { cOpts = append(cOpts, containerd.WithNewSnapshot(id, image)) } - cOpts = append(cOpts, containerd.WithSnapshotter(context.String("snapshotter"))) } opts = append(opts, withEnv(context), withMounts(context))