opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-12 17:57:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1103 from haircommander/load_dockerless

Browse Source 
Podman load/tag/save prepends localhost when no registry is present
This commit is contained in:
Matthew Heon
2018-07-20 12:50:18 -04:00
committed by GitHub
parent 7944bca468 0fecfeee63
commit 6cae4a0e94
6 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/podman/save.go
View File

@@ -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 {