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

Merge pull request #1167 from crosbymichael/multi-ss

Browse Source 
support using multiple snapshotters simultaneously
This commit is contained in:
Derek McGowan
2017-07-12 13:34:31 -07:00
committed by GitHub
parent 052a8d03ed b06aab713a
commit 1a49f5ea79
22 changed files with 743 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
container.go
View File

@@ -124,7 +124,7 @@ func (c *container) Spec() (*specs.Spec, error) {
// WithRootFSDeletion deletes the rootfs allocated for the container
func WithRootFSDeletion(ctx context.Context, client *Client, c containers.Container) error {
if c.RootFS != "" {
return client.SnapshotService().Remove(ctx, c.RootFS)
return client.SnapshotService(c.Snapshotter).Remove(ctx, c.RootFS)
}
return nil
}
@@ -185,7 +185,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne
}
if c.c.RootFS != "" {
// get the rootfs from the snapshotter and add it to the request
mounts, err := c.client.SnapshotService().Mounts(ctx, c.c.RootFS)
mounts, err := c.client.SnapshotService(c.c.Snapshotter).Mounts(ctx, c.c.RootFS)
if err != nil {
return nil, err
}