Merge pull request #180 from mtrmac/api-changes

Vendor in API changes from containers/image#64

cmd/skopeo/copy.go

@@ -91,11 +91,11 @@ func copyHandler(context *cli.Context) error {
 		return fmt.Errorf("Error initializing %s: %v", context.Args()[1], err)
 	}
 
-	rawSource, err := parseImageSource(context, context.Args()[0])
+	rawSource, err := parseImageSource(context, context.Args()[0], dest.SupportedManifestMIMETypes())
 	if err != nil {
 		return fmt.Errorf("Error initializing %s: %v", context.Args()[0], err)
 	}
-	src := image.FromSource(rawSource, dest.SupportedManifestMIMETypes())
+	src := image.FromSource(rawSource)
 
 	signBy := context.String("sign-by")
 

cmd/skopeo/delete.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"errors"
+	"fmt"
 
+	"github.com/containers/image/transports"
 	"github.com/urfave/cli"
 )
 
@@ -11,12 +13,12 @@ func deleteHandler(context *cli.Context) error {
 		return errors.New("Usage: delete imageReference")
 	}
 
-	image, err := parseImageSource(context, context.Args()[0])
+	ref, err := transports.ParseImageName(context.Args()[0])
 	if err != nil {
-		return err
+		return fmt.Errorf("Invalid source name %s: %v", context.Args()[0], err)
 	}
 
-	if err := image.Delete(); err != nil {
+	if err := ref.DeleteImage(contextFromGlobalOptions(context)); err != nil {
 		return err
 	}
 	return nil

cmd/skopeo/layers.go

@@ -16,16 +16,16 @@ var layersCmd = cli.Command{
 	Usage:     "Get layers of IMAGE-NAME",
 	ArgsUsage: "IMAGE-NAME",
 	Action: func(c *cli.Context) error {
-		rawSource, err := parseImageSource(c, c.Args()[0])
-		if err != nil {
-			return err
-		}
-		src := image.FromSource(rawSource, []string{
+		rawSource, err := parseImageSource(c, c.Args()[0], []string{
 			// TODO: skopeo layers only support these now
 			// eventually we'll remove this command altogether...
 			manifest.DockerV2Schema1SignedMIMEType,
 			manifest.DockerV2Schema1MIMEType,
 		})
+		if err != nil {
+			return err
+		}
+		src := image.FromSource(rawSource)
 		blobDigests := c.Args().Tail()
 		if len(blobDigests) == 0 {
 			b, err := src.BlobDigests()
@@ -42,7 +42,7 @@ var layersCmd = cli.Command{
 		if err != nil {
 			return err
 		}
-		dest, err := tmpDirRef.NewImageDestination("", true)
+		dest, err := tmpDirRef.NewImageDestination(nil)
 		if err != nil {
 			return err
 		}

cmd/skopeo/utils.go

@@ -6,42 +6,41 @@ import (
 	"github.com/urfave/cli"
 )
 
+// contextFromGlobalOptions returns a types.SystemContext depending on c.
+func contextFromGlobalOptions(c *cli.Context) *types.SystemContext {
+	certPath := c.GlobalString("cert-path")
+	tlsVerify := c.GlobalBool("tls-verify") // FIXME!! defaults to false
+	return &types.SystemContext{
+		DockerCertPath:              certPath,
+		DockerInsecureSkipTLSVerify: !tlsVerify,
+	}
+}
+
 // ParseImage converts image URL-like string to an initialized handler for that image.
 func parseImage(c *cli.Context) (types.Image, error) {
-	var (
-		imgName   = c.Args().First()
-		certPath  = c.GlobalString("cert-path")
-		tlsVerify = c.GlobalBool("tls-verify")
-	)
+	imgName := c.Args().First()
 	ref, err := transports.ParseImageName(imgName)
 	if err != nil {
 		return nil, err
 	}
-	return ref.NewImage(certPath, tlsVerify)
+	return ref.NewImage(contextFromGlobalOptions(c))
 }
 
 // parseImageSource converts image URL-like string to an ImageSource.
-func parseImageSource(c *cli.Context, name string) (types.ImageSource, error) {
-	var (
-		certPath  = c.GlobalString("cert-path")
-		tlsVerify = c.GlobalBool("tls-verify") // FIXME!! defaults to false?
-	)
+// requestedManifestMIMETypes is as in types.ImageReference.NewImageSource.
+func parseImageSource(c *cli.Context, name string, requestedManifestMIMETypes []string) (types.ImageSource, error) {
 	ref, err := transports.ParseImageName(name)
 	if err != nil {
 		return nil, err
 	}
-	return ref.NewImageSource(certPath, tlsVerify)
+	return ref.NewImageSource(contextFromGlobalOptions(c), requestedManifestMIMETypes)
 }
 
 // parseImageDestination converts image URL-like string to an ImageDestination.
 func parseImageDestination(c *cli.Context, name string) (types.ImageDestination, error) {
-	var (
-		certPath  = c.GlobalString("cert-path")
-		tlsVerify = c.GlobalBool("tls-verify") // FIXME!! defaults to false?
-	)
 	ref, err := transports.ParseImageName(name)
 	if err != nil {
 		return nil, err
 	}
-	return ref.NewImageDestination(certPath, tlsVerify)
+	return ref.NewImageDestination(contextFromGlobalOptions(c))
 }