vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

images: move image package to images

Browse source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-03-21 17:36:37 -07:00
parent 604af9cd46
commit 39da6ff879
No known key found for this signature in database
GPG key ID: 67B3DED84EDC823F
10 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/ctr/run.go
View file

@ -14,7 +14,7 @@ import (
"github.com/crosbymichael/console"
"github.com/docker/containerd/api/services/execution"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/image"
"github.com/docker/containerd/images"
protobuf "github.com/gogo/protobuf/types"
"github.com/opencontainers/image-spec/identity"
"github.com/opencontainers/runtime-spec/specs-go"
@ -224,7 +224,7 @@ var runCommand = cli.Command{
ref := context.Args().First()
im, err := image.Get(tx, ref)
image, err := images.Get(tx, ref)
if err != nil {
return errors.Wrapf(err, "could not resolve %q", ref)
}
@ -232,7 +232,7 @@ var runCommand = cli.Command{
tx.Rollback()
db.Close()
diffIDs, err := im.RootFS(ctx, provider)
diffIDs, err := image.RootFS(ctx, provider)
if err != nil {
return err
}

4
cmd/ctr/utils.go
View file

@ -20,7 +20,7 @@ import (
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/api/types/container"
"github.com/docker/containerd/content"
"github.com/docker/containerd/image"
"github.com/docker/containerd/images"
contentservice "github.com/docker/containerd/services/content"
"github.com/pkg/errors"
"github.com/tonistiigi/fifo"
@ -147,7 +147,7 @@ func getDB(ctx *cli.Context, readonly bool) (*bolt.DB, error) {
}
if !readonly {
if err := image.InitDB(db); err != nil {
if err := images.InitDB(db); err != nil {
return nil, err
}
}