Merge pull request containers#187 from mtrmac/api-changes

Update for mtrmac/image:api-changes

cmd/skopeo/inspect.go

@@ -39,6 +39,8 @@ var inspectCmd = cli.Command{
 		if err != nil {
 			return err
 		}
+		defer img.Close()
+
 		rawManifest, _, err := img.Manifest()
 		if err != nil {
 			return err

cmd/skopeo/layers.go

@@ -26,6 +26,8 @@ var layersCmd = cli.Command{
 			return err
 		}
 		src := image.FromSource(rawSource)
+		defer src.Close()
+
 		blobDigests := c.Args().Tail()
 		if len(blobDigests) == 0 {
 			b, err := src.BlobDigests()
@@ -46,27 +48,35 @@ var layersCmd = cli.Command{
 		if err != nil {
 			return err
 		}
-		manifest, _, err := src.Manifest()
-		if err != nil {
-			return err
-		}
-		if err := dest.PutManifest(manifest); err != nil {
-			return err
-		}
+		defer dest.Close()
+
 		for _, digest := range blobDigests {
 			if !strings.HasPrefix(digest, "sha256:") {
 				digest = "sha256:" + digest
 			}
-			r, _, err := rawSource.GetBlob(digest)
+			r, blobSize, err := rawSource.GetBlob(digest)
 			if err != nil {
 				return err
 			}
-			if err := dest.PutBlob(digest, r); err != nil {
+			if err := dest.PutBlob(digest, blobSize, r); err != nil {
 				r.Close()
 				return err
 			}
 			r.Close()
 		}
+
+		manifest, _, err := src.Manifest()
+		if err != nil {
+			return err
+		}
+		if err := dest.PutManifest(manifest); err != nil {
+			return err
+		}
+
+		if err := dest.Commit(); err != nil {
+			return err
+		}
+
 		return nil
 	},
 }

cmd/skopeo/utils.go

@@ -17,6 +17,7 @@ func contextFromGlobalOptions(c *cli.Context) *types.SystemContext {
 }
 
 // ParseImage converts image URL-like string to an initialized handler for that image.
+// The caller must call .Close() on the returned Image.
 func parseImage(c *cli.Context) (types.Image, error) {
 	imgName := c.Args().First()
 	ref, err := transports.ParseImageName(imgName)
@@ -28,6 +29,7 @@ func parseImage(c *cli.Context) (types.Image, error) {
 
 // parseImageSource converts image URL-like string to an ImageSource.
 // requestedManifestMIMETypes is as in types.ImageReference.NewImageSource.
+// The caller must call .Close() on the returned ImageSource.
 func parseImageSource(c *cli.Context, name string, requestedManifestMIMETypes []string) (types.ImageSource, error) {
 	ref, err := transports.ParseImageName(name)
 	if err != nil {