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
}
}

4
cmd/dist/common.go vendored
View file

@ -7,7 +7,7 @@ import (
"github.com/boltdb/bolt"
"github.com/docker/containerd/content"
"github.com/docker/containerd/image"
"github.com/docker/containerd/images"
"github.com/urfave/cli"
"google.golang.org/grpc"
)
@ -50,7 +50,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
}
}

8
cmd/dist/fetch.go vendored
View file

@ -10,7 +10,7 @@ import (
"time"
contentapi "github.com/docker/containerd/api/services/content"
"github.com/docker/containerd/image"
"github.com/docker/containerd/images"
"github.com/docker/containerd/log"
"github.com/docker/containerd/progress"
"github.com/docker/containerd/remotes"
@ -79,13 +79,13 @@ Most of this is experimental and there are few leaps to make this work.`,
log.G(ctx).WithField("image", name).Debug("fetching")
close(resolved)
return image.Dispatch(ctx,
image.Handlers(image.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
return images.Dispatch(ctx,
images.Handlers(images.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
ongoing.add(remotes.MakeRefKey(ctx, desc))
return nil, nil
}),
remotes.FetchHandler(ingester, fetcher),
image.ChildrenHandler(provider),
images.ChildrenHandler(provider),
),
desc)
})

4
cmd/dist/images.go vendored
View file

@ -5,7 +5,7 @@ import (
"os"
"text/tabwriter"
"github.com/docker/containerd/image"
"github.com/docker/containerd/images"
"github.com/docker/containerd/progress"
"github.com/pkg/errors"
"github.com/urfave/cli"
@ -29,7 +29,7 @@ var imagesCommand = cli.Command{
}
defer tx.Rollback()
images, err := image.List(tx)
images, err := images.List(tx)
if err != nil {
return errors.Wrap(err, "failed to list images")
}

12
cmd/dist/pull.go vendored
View file

@ -10,7 +10,7 @@ import (
contentapi "github.com/docker/containerd/api/services/content"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/content"
"github.com/docker/containerd/image"
"github.com/docker/containerd/images"
"github.com/docker/containerd/log"
"github.com/docker/containerd/progress"
"github.com/docker/containerd/remotes"
@ -87,7 +87,7 @@ command. As part of this process, we do the following:
close(resolved)
eg.Go(func() error {
return image.Register(tx, name, desc)
return images.Register(tx, name, desc)
})
defer func() {
if err := tx.Commit(); err != nil {
@ -95,13 +95,13 @@ command. As part of this process, we do the following:
}
}()
return image.Dispatch(ctx,
image.Handlers(image.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
return images.Dispatch(ctx,
images.Handlers(images.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
ongoing.add(remotes.MakeRefKey(ctx, desc))
return nil, nil
}),
remotes.FetchHandler(ingester, fetcher),
image.ChildrenHandler(provider)),
images.ChildrenHandler(provider)),
desc)
})
@ -123,7 +123,7 @@ command. As part of this process, we do the following:
// root filesystem chainid for the image. For now, we just print
// it, but we should keep track of this in the metadata storage.
image, err := image.Get(tx, resolvedImageName)
image, err := images.Get(tx, resolvedImageName)
if err != nil {
log.G(ctx).Fatal(err)
}