From 0fecfeee6398e2db6b7b3fd257645a6ea9aab542 Mon Sep 17 00:00:00 2001 From: haircommander Date: Fri, 13 Jul 2018 17:45:55 -0400 Subject: Podman load/tag/save prepend localhost when no repository is present Instead of having docker.io/library as its repository. Test included. Signed-off-by: haircommander --- cmd/podman/save.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/save.go b/cmd/podman/save.go index 2f9adc843..016fa580a 100644 --- a/cmd/podman/save.go +++ b/cmd/podman/save.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "io" "os" "strings" @@ -118,14 +119,26 @@ func saveCmd(c *cli.Context) error { return err } } - newImage, err := runtime.ImageRuntime().NewFromLocal(args[0]) + 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(), args[0]) { - dest = dst + ":" + args[0] + 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 err2 := os.Remove(output); err2 != nil { -- cgit v1.2.3-54-g00ecf