content: cleanup service and interfaces

After implementing pull, a few changes are required to the content store
interface to make sure that the implementation works smoothly.
Specifically, we work to make sure the predeclaration path for digests
works the same between remote and local writers. Before, we were
hesitent to require the the size and digest up front, but it became
clear that having this provided significant benefit.

There are also several cleanups related to naming. We now call the
expected digest `Expected` consistently across the board and `Total` is
used to mark the expected size.

This whole effort comes together to provide a very smooth status
reporting workflow for image pull and push. This will be more obvious
when the bulk of pull code lands.

There are a few other changes to make `content.WriteBlob` more broadly
useful. In accordance with addition for predeclaring expected size when
getting a `Writer`, `WriteBlob` now supports this fully. It will also
resume downloads if provided an `io.Seeker` or `io.ReaderAt`. Coupled
with the `httpReadSeeker` from `docker/distribution`, we should only be
a lines of code away from resumable downloads.

Signed-off-by: Stephen J Day <stephen.day@docker.com>

cmd/dist/common.go

@@ -11,7 +11,7 @@ import (
 )
 
 func resolveContentStore(context *cli.Context) (*content.Store, error) {
-	root := context.GlobalString("root")
+	root := filepath.Join(context.GlobalString("root"), "content")
 	if !filepath.IsAbs(root) {
 		var err error
 		root, err = filepath.Abs(root)

cmd/dist/fetch.go

@@ -100,8 +100,8 @@ var fetchCommand = cli.Command{
 
 // getResolver prepares the resolver from the environment and options.
 func getResolver(ctx contextpkg.Context) (remotes.Resolver, error) {
-	return remotes.ResolverFunc(func(ctx contextpkg.Context, locator string) (remotes.Remote, error) {
-		if !strings.HasPrefix(locator, "docker.io") {
+	return remotes.ResolverFunc(func(ctx contextpkg.Context, locator string) (remotes.Fetcher, error) {
+		if !strings.HasPrefix(locator, "docker.io") && !strings.HasPrefix(locator, "localhost:5000") {
 			return nil, errors.Errorf("unsupported locator: %q", locator)
 		}
 
@@ -113,12 +113,18 @@ func getResolver(ctx contextpkg.Context) (remotes.Resolver, error) {
 			prefix = strings.TrimPrefix(locator, "docker.io/")
 		)
 
+		if strings.HasPrefix(locator, "localhost:5000") {
+			base.Scheme = "http"
+			base.Host = "localhost:5000"
+			prefix = strings.TrimPrefix(locator, "localhost:5000/")
+		}
+
 		token, err := getToken(ctx, "repository:"+prefix+":pull")
 		if err != nil {
 			return nil, err
 		}
 
-		return remotes.RemoteFunc(func(ctx contextpkg.Context, object string, hints ...string) (io.ReadCloser, error) {
+		return remotes.FetcherFunc(func(ctx contextpkg.Context, object string, hints ...string) (io.ReadCloser, error) {
 			ctx = log.WithLogger(ctx, log.G(ctx).WithFields(
 				logrus.Fields{
 					"prefix": prefix, // or repo?

cmd/dist/ingest.go

@@ -56,6 +56,6 @@ var ingestCommand = cli.Command{
 		// TODO(stevvooe): Allow ingest to be reentrant. Currently, we expect
 		// all data to be written in a single invocation. Allow multiple writes
 		// to the same transaction key followed by a commit.
-		return content.WriteBlob(ctx, ingester, os.Stdin, ref, expectedSize, expectedDigest)
+		return content.WriteBlob(ctx, ingester, ref, os.Stdin, expectedSize, expectedDigest)
 	},
 }

cmd/dist/main.go

@@ -38,9 +38,11 @@ distribution tool
 			EnvVar: "CONTAINERD_FETCH_TIMEOUT",
 		},
 		cli.StringFlag{
+			// TODO(stevvooe): for now, we allow circumventing the GRPC. Once
+			// we have clear separation, this will likely go away.
 			Name:  "root",
 			Usage: "path to content store root",
-			Value: "/tmp/content", // TODO(stevvooe): for now, just use the PWD/.content
+			Value: "/var/lib/containerd",
 		},
 		cli.StringFlag{
 			Name:  "socket, s",