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

Merge pull request #1746 from AkihiroSuda/split-differ-interface

Browse Source 
diff: resplit Applier from Differ
This commit is contained in:
Michael Crosby
2018-02-05 09:18:56 -05:00
committed by GitHub
parent 13733b6a65 b763777288
commit 78bd07afef
13 changed files with 229 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerd/builtins.go
View File

@@ -2,7 +2,7 @@ package main
// register containerd builtins here
import (
_ "github.com/containerd/containerd/diff/walking"
_ "github.com/containerd/containerd/diff/walking/plugin"
_ "github.com/containerd/containerd/gc/scheduler"
_ "github.com/containerd/containerd/services/containers"
_ "github.com/containerd/containerd/services/content"

4
cmd/ctr/commands/snapshots/snapshots.go
View File

@@ -129,7 +129,7 @@ var diffCommand = cli.Command{
}
if idB == "" {
desc, err = rootfs.Diff(ctx, idA, snapshotter, client.DiffService(), opts...)
desc, err = rootfs.CreateDiff(ctx, idA, snapshotter, client.DiffService(), opts...)
if err != nil {
return err
}
@@ -145,7 +145,7 @@ var diffCommand = cli.Command{
if err != nil {
return err
}
desc, err = ds.DiffMounts(ctx, a, b, opts...)
desc, err = ds.Compare(ctx, a, b, opts...)
if err != nil {
return err
}