summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-09 16:38:39 +0200
committerGitHub <noreply@github.com>2020-07-09 16:38:39 +0200
commitf86782c05293987acc750b259fa5a7fa0106b5b6 (patch)
tree1ffbbf205bfd1a537ce36dc5f891091cc4938228
parentedf5fe8b17f39ce98805c279b9795bfd4123abe2 (diff)
parenta1d6114177874125550890c0e4b30a98fc6d304e (diff)
downloadpodman-f86782c05293987acc750b259fa5a7fa0106b5b6.tar.gz
podman-f86782c05293987acc750b259fa5a7fa0106b5b6.tar.bz2
podman-f86782c05293987acc750b259fa5a7fa0106b5b6.zip
Merge pull request #6814 from QiWang19/oci-dir
Fix saving in oci format
-rw-r--r--libpod/image/image.go6
-rw-r--r--libpod/runtime_img.go64
2 files changed, 48 insertions, 22 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go
index 048ec825d..e2bd1ad5d 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -21,6 +21,7 @@ import (
"github.com/containers/image/v5/image"
"github.com/containers/image/v5/manifest"
ociarchive "github.com/containers/image/v5/oci/archive"
+ "github.com/containers/image/v5/oci/layout"
is "github.com/containers/image/v5/storage"
"github.com/containers/image/v5/tarball"
"github.com/containers/image/v5/transports"
@@ -1483,9 +1484,10 @@ func (i *Image) Save(ctx context.Context, source, format, output string, moreTag
return errors.Wrapf(err, "error getting OCI archive ImageReference for (%q, %q)", output, destImageName)
}
case "oci-dir":
- destRef, err = directory.NewReference(output)
+ destImageName := imageNameForSaveDestination(i, source)
+ destRef, err = layout.NewReference(output, destImageName) // destImageName may be ""
if err != nil {
- return errors.Wrapf(err, "error getting directory ImageReference for %q", output)
+ return errors.Wrapf(err, "error getting the OCI directory ImageReference for (%q, %q)", output, destImageName)
}
manifestType = imgspecv1.MediaTypeImageManifest
case "docker-dir":
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index eab05f34d..370c9d610 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -8,9 +8,15 @@ import (
"net/http"
"net/url"
"os"
+ "strings"
"github.com/containers/buildah/imagebuildah"
+ "github.com/containers/image/v5/directory"
"github.com/containers/image/v5/docker/reference"
+ ociarchive "github.com/containers/image/v5/oci/archive"
+ "github.com/containers/image/v5/oci/layout"
+ "github.com/containers/image/v5/types"
+
"github.com/containers/libpod/v2/libpod/define"
"github.com/containers/libpod/v2/libpod/image"
"github.com/containers/libpod/v2/pkg/util"
@@ -18,9 +24,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
- "github.com/containers/image/v5/directory"
dockerarchive "github.com/containers/image/v5/docker/archive"
- ociarchive "github.com/containers/image/v5/oci/archive"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
)
@@ -256,28 +260,48 @@ func DownloadFromFile(reader *os.File) (string, error) {
// LoadImage loads a container image into local storage
func (r *Runtime) LoadImage(ctx context.Context, name, inputFile string, writer io.Writer, signaturePolicy string) (string, error) {
- var newImages []*image.Image
- src, err := dockerarchive.ParseReference(inputFile) // FIXME? We should add dockerarchive.NewReference()
- if err == nil {
- newImages, err = r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer)
- }
- if err != nil {
- // generate full src name with specified image:tag
- src, err := ociarchive.NewReference(inputFile, name) // imageName may be ""
- if err == nil {
- newImages, err = r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer)
- }
- if err != nil {
- src, err := directory.NewReference(inputFile)
- if err == nil {
- newImages, err = r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer)
+ var (
+ newImages []*image.Image
+ err error
+ src types.ImageReference
+ )
+
+ for _, referenceFn := range []func() (types.ImageReference, error){
+ func() (types.ImageReference, error) {
+ return dockerarchive.ParseReference(inputFile) // FIXME? We should add dockerarchive.NewReference()
+ },
+ func() (types.ImageReference, error) {
+ return ociarchive.NewReference(inputFile, name) // name may be ""
+ },
+ func() (types.ImageReference, error) {
+ // prepend "localhost/" to support local image saved with this semantics
+ if !strings.Contains(name, "/") {
+ return ociarchive.NewReference(inputFile, fmt.Sprintf("%s/%s", image.DefaultLocalRegistry, name))
+ }
+ return nil, nil
+ },
+ func() (types.ImageReference, error) {
+ return directory.NewReference(inputFile)
+ },
+ func() (types.ImageReference, error) {
+ return layout.NewReference(inputFile, name)
+ },
+ func() (types.ImageReference, error) {
+ // prepend "localhost/" to support local image saved with this semantics
+ if !strings.Contains(name, "/") {
+ return layout.NewReference(inputFile, fmt.Sprintf("%s/%s", image.DefaultLocalRegistry, name))
}
- if err != nil {
- return "", errors.Wrapf(err, "error pulling %q", name)
+ return nil, nil
+ },
+ } {
+ src, err = referenceFn()
+ if err == nil && src != nil {
+ if newImages, err = r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer); err == nil {
+ return getImageNames(newImages), nil
}
}
}
- return getImageNames(newImages), nil
+ return "", errors.Wrapf(err, "error pulling %q", name)
}
func getImageNames(images []*image.Image) string {