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

Merge pull request #983 from tonistiigi/fix-ctx-imports

Browse Source 
Fix context package imports
This commit is contained in:
Michael Crosby 2017-06-09 11:23:49 -07:00 committed by GitHub
commit c45dae71db
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rootfs/apply.go
View File

@ -1,7 +1,6 @@
package rootfs package rootfs
import ( import (
"context"
"fmt" "fmt"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
@ -11,6 +10,7 @@ import (
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/net/context"
) )
type Applier interface { type Applier interface {

2
rootfs/diff.go
View File

@ -1,13 +1,13 @@
package rootfs package rootfs
import ( import (
"context"
"fmt" "fmt"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/snapshot" "github.com/containerd/containerd/snapshot"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"golang.org/x/net/context"
) )
type MountDiffer interface { type MountDiffer interface {

3
services/diff/client.go
View File

@ -1,14 +1,13 @@
package diff package diff
import ( import (
"context"
diffapi "github.com/containerd/containerd/api/services/diff" diffapi "github.com/containerd/containerd/api/services/diff"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/descriptor"
mounttypes "github.com/containerd/containerd/api/types/mount" mounttypes "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/rootfs"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"golang.org/x/net/context"
) )
type DiffService interface { type DiffService interface {