opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-26 11:33:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

save and load should support multi-tag for docker-archive

Browse Source 
The docker-archive tar files can have multiple tags for the same
image stored in it. Load pulls all the tags found in the archive
when loading a tar file. Save can oush multiple tags of the same
image to a tar archive.

Signed-off-by: umohnani8 <umohnani@redhat.com>

Closes: #819
Approved by: rhatdan
This commit is contained in:
umohnani8
2018-05-21 13:53:19 -04:00
committed by Atomic Bot
parent 0a4ade1c17
commit c8b72e57a7
14 changed files with 1782 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/podman/pull.go
View File

@ -1,14 +1,15 @@
package main
import (
"fmt"
"io"
"os"
"fmt"
"strings"
"github.com/containers/image/types"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
"github.com/projectatomic/libpod/libpod"
image2 "github.com/projectatomic/libpod/libpod/image"
"github.com/projectatomic/libpod/pkg/util"
"github.com/sirupsen/logrus"
@ -90,7 +91,10 @@ func pullCmd(c *cli.Context) error {
registryCreds = creds
}
var writer io.Writer
var (
writer io.Writer
imgID string
)
if !c.Bool("quiet") {
writer = os.Stderr
}
@ -104,13 +108,23 @@ func pullCmd(c *cli.Context) error {
forceSecure = c.Bool("tls-verify")
}
newImage, err := runtime.ImageRuntime().New(getContext(), image, c.String("signature-policy"), c.String("authfile"), writer, &dockerRegistryOptions, image2.SigningOptions{}, true, forceSecure)
if err != nil {
return errors.Wrapf(err, "error pulling image %q", image)
// Possible for docker-archive to have multiple tags, so use NewFromLoad instead
if strings.Contains(image, libpod.DockerArchive) {
newImage, err := runtime.ImageRuntime().LoadFromArchive(getContext(), image, c.String("signature-policy"), writer)
if err != nil {
return errors.Wrapf(err, "error pulling image from %q", image)
}
imgID = newImage[0].ID()
} else {
newImage, err := runtime.ImageRuntime().New(getContext(), image, c.String("signature-policy"), c.String("authfile"), writer, &dockerRegistryOptions, image2.SigningOptions{}, true, forceSecure)
if err != nil {
return errors.Wrapf(err, "error pulling image %q", image)
}
imgID = newImage.ID()
}
// Intentionally choosing to ignore if there is an error because
// outputting the image ID is a NTH and not integral to the pull
fmt.Println(newImage.ID())
fmt.Println(imgID)
return nil
}