opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 21:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

RFC? Hard-code "format" string values instead of using libpod.* transport names

Browse Source 
We don't really want to change the names of the CLI options just because
the transport names change (with oci-dir/docker-dir there is no
direct correspondence wanyway), and this removes a dependency.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Closes: #1176
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač
2018-07-28 04:11:15 +02:00
committed by Atomic Bot
parent a5c1cecbea
commit 90abdfdff5
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/save.go
View File

@ -15,7 +15,6 @@ import (
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/podman/libpodruntime" "github.com/projectatomic/libpod/cmd/podman/libpodruntime"
"github.com/projectatomic/libpod/libpod"
libpodImage "github.com/projectatomic/libpod/libpod/image" libpodImage "github.com/projectatomic/libpod/libpod/image"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
@ -106,7 +105,7 @@ func saveCmd(c *cli.Context) error {
var destRef types.ImageReference var destRef types.ImageReference
var manifestType string var manifestType string
switch c.String("format") { switch c.String("format") {
case libpod.OCIArchive: case "oci-archive":
destImageName := imageNameForSaveDestination(newImage, source) destImageName := imageNameForSaveDestination(newImage, source)
destRef, err = ociarchive.NewReference(output, destImageName) // destImageName may be "" destRef, err = ociarchive.NewReference(output, destImageName) // destImageName may be ""
if err != nil { if err != nil {
@ -124,9 +123,7 @@ func saveCmd(c *cli.Context) error {
return errors.Wrapf(err, "error getting directory ImageReference for %q", output) return errors.Wrapf(err, "error getting directory ImageReference for %q", output)
} }
manifestType = manifest.DockerV2Schema2MediaType manifestType = manifest.DockerV2Schema2MediaType
case libpod.DockerArchive: case "docker-archive", "":
fallthrough
case "":
dst := output dst := output
destImageName := imageNameForSaveDestination(newImage, source) destImageName := imageNameForSaveDestination(newImage, source)
if destImageName != "" { if destImageName != "" {