1 files changed, 60 insertions, 32 deletions

diff --git a/cmd/podman/save.go b/cmd/podman/save.go
index 016fa580a..6a0d12885 100644
--- a/cmd/podman/save.go
+++ b/cmd/podman/save.go
@@ -6,12 +6,15 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/image/directory"
+	dockerarchive "github.com/containers/image/docker/archive"
 	"github.com/containers/image/docker/reference"
 	"github.com/containers/image/manifest"
+	ociarchive "github.com/containers/image/oci/archive"
+	"github.com/containers/image/types"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
-	"github.com/projectatomic/libpod/libpod"
 	libpodImage "github.com/projectatomic/libpod/libpod/image"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
@@ -93,20 +96,43 @@ func saveCmd(c *cli.Context) error {
 		return err
 	}
 
-	var dst, manifestType string
+	source := args[0]
+	newImage, err := runtime.ImageRuntime().NewFromLocal(source)
+	if err != nil {
+		return err
+	}
+
+	var destRef types.ImageReference
+	var manifestType string
 	switch c.String("format") {
-	case libpod.OCIArchive:
-		dst = libpod.OCIArchive + ":" + output
+	case "oci-archive":
+		destImageName := imageNameForSaveDestination(newImage, source)
+		destRef, err = ociarchive.NewReference(output, destImageName) // destImageName may be ""
+		if err != nil {
+			return errors.Wrapf(err, "error getting OCI archive ImageReference for (%q, %q)", output, destImageName)
+		}
 	case "oci-dir":
-		dst = libpod.DirTransport + ":" + output
+		destRef, err = directory.NewReference(output)
+		if err != nil {
+			return errors.Wrapf(err, "error getting directory ImageReference for %q", output)
+		}
 		manifestType = imgspecv1.MediaTypeImageManifest
 	case "docker-dir":
-		dst = libpod.DirTransport + ":" + output
+		destRef, err = directory.NewReference(output)
+		if err != nil {
+			return errors.Wrapf(err, "error getting directory ImageReference for %q", output)
+		}
 		manifestType = manifest.DockerV2Schema2MediaType
-	case libpod.DockerArchive:
-		fallthrough
-	case "":
-		dst = libpod.DockerArchive + ":" + output
+	case "docker-archive", "":
+		dst := output
+		destImageName := imageNameForSaveDestination(newImage, source)
+		if destImageName != "" {
+			dst = fmt.Sprintf("%s:%s", dst, destImageName)
+		}
+		destRef, err = dockerarchive.ParseReference(dst) // FIXME? Add dockerarchive.NewReference
+		if err != nil {
+			return errors.Wrapf(err, "error getting Docker archive ImageReference for %q", dst)
+		}
 	default:
 		return errors.Errorf("unknown format option %q", c.String("format"))
 	}
@@ -119,28 +145,8 @@ func saveCmd(c *cli.Context) error {
 			return err
 		}
 	}
-	source := args[0]
-	newImage, err := runtime.ImageRuntime().NewFromLocal(source)
-	if err != nil {
-		return err
-	}
-	dest := dst
-	// need dest to be in the format transport:path:reference for the following transports
-	if (strings.Contains(dst, libpod.OCIArchive) || strings.Contains(dst, libpod.DockerArchive)) && !strings.Contains(newImage.ID(), source) {
-		prepend := ""
-		if !strings.Contains(source, libpodImage.DefaultLocalRepo) {
-			// we need to check if localhost was added to the image name in NewFromLocal
-			for _, name := range newImage.Names() {
-				// if the user searched for the image whose tag was prepended with localhost, we'll need to prepend localhost to successfully search
-				if strings.Contains(name, libpodImage.DefaultLocalRepo) && strings.Contains(name, source) {
-					prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo)
-					break
-				}
-			}
-		}
-		dest = fmt.Sprintf("%s:%s%s", dst, prepend, source)
-	}
-	if err := newImage.PushImage(getContext(), dest, manifestType, "", "", writer, c.Bool("compress"), libpodImage.SigningOptions{}, &libpodImage.DockerRegistryOptions{}, false, additionaltags); err != nil {
+
+	if err := newImage.PushImageToReference(getContext(), destRef, manifestType, "", "", writer, c.Bool("compress"), libpodImage.SigningOptions{}, &libpodImage.DockerRegistryOptions{}, false, additionaltags); err != nil {
 		if err2 := os.Remove(output); err2 != nil {
 			logrus.Errorf("error deleting %q: %v", output, err)
 		}
@@ -149,3 +155,25 @@ func saveCmd(c *cli.Context) error {
 
 	return nil
 }
+
+// imageNameForSaveDestination returns a Docker-like reference appropriate for saving img,
+// which the user referred to as imgUserInput; or an empty string, if there is no appropriate
+// reference.
+func imageNameForSaveDestination(img *libpodImage.Image, imgUserInput string) string {
+	if strings.Contains(img.ID(), imgUserInput) {
+		return ""
+	}
+
+	prepend := ""
+	if !strings.Contains(imgUserInput, libpodImage.DefaultLocalRepo) {
+		// we need to check if localhost was added to the image name in NewFromLocal
+		for _, name := range img.Names() {
+			// if the user searched for the image whose tag was prepended with localhost, we'll need to prepend localhost to successfully search
+			if strings.Contains(name, libpodImage.DefaultLocalRepo) && strings.Contains(name, imgUserInput) {
+				prepend = fmt.Sprintf("%s/", libpodImage.DefaultLocalRepo)
+				break
+			}
+		}
+	}
+	return fmt.Sprintf("%s%s", prepend, imgUserInput)
+}