Merge pull request #3849 from openSUSE/directory-pull

Fix directory pull image name for OCI images

3 files changed, 48 insertions, 7 deletions

diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index 78cfe3626..dbf3a4ef5 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -13,6 +13,7 @@ import (
 	dockerarchive "github.com/containers/image/docker/archive"
 	"github.com/containers/image/docker/tarfile"
 	ociarchive "github.com/containers/image/oci/archive"
+	oci "github.com/containers/image/oci/layout"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
@@ -37,6 +38,9 @@ var (
 	DirTransport = directory.Transport.Name()
 	// DockerTransport is the transport for docker registries
 	DockerTransport = docker.Transport.Name()
+	// OCIDirTransport is the transport for pushing and pulling
+	// images to and from a directory containing an OCI image
+	OCIDirTransport = oci.Transport.Name()
 	// AtomicTransport is the transport for atomic registries
 	AtomicTransport = "atomic"
 	// DefaultTransport is a prefix that we apply to an image name
@@ -189,12 +193,12 @@ func (ir *Runtime) pullGoalFromImageReference(ctx context.Context, srcRef types.
 		return ir.getSinglePullRefPairGoal(srcRef, dest)
 
 	case DirTransport:
-		path := srcRef.StringWithinTransport()
-		image := path
-		if image[:1] == "/" {
-			// Set localhost as the registry so docker.io isn't prepended, and the path becomes the repository
-			image = DefaultLocalRegistry + image
-		}
+		image := toLocalImageName(srcRef.StringWithinTransport())
+		return ir.getSinglePullRefPairGoal(srcRef, image)
+
+	case OCIDirTransport:
+		split := strings.SplitN(srcRef.StringWithinTransport(), ":", 2)
+		image := toLocalImageName(split[0])
 		return ir.getSinglePullRefPairGoal(srcRef, image)
 
 	default:
@@ -202,6 +206,15 @@ func (ir *Runtime) pullGoalFromImageReference(ctx context.Context, srcRef types.
 	}
 }
 
+// toLocalImageName converts an image name into a 'localhost/' prefixed one
+func toLocalImageName(imageName string) string {
+	return fmt.Sprintf(
+		"%s/%s",
+		DefaultLocalRegistry,
+		strings.TrimLeft(imageName, "/"),
+	)
+}
+
 // pullImageFromHeuristicSource pulls an image based on inputName, which is heuristically parsed and may involve configured registries.
 // Use pullImageFromReference if the source is known precisely.
 func (ir *Runtime) pullImageFromHeuristicSource(ctx context.Context, inputName string, writer io.Writer, authfile, signaturePolicyPath string, signingOptions SigningOptions, dockerOptions *DockerRegistryOptions, label *string) ([]string, error) {
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index d6e7b44d1..68fcaf133 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -150,6 +150,34 @@ var _ = Describe("Podman pull", func() {
 		session = podmanTest.PodmanNoCache([]string{"pull", imgPath})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
+		session = podmanTest.PodmanNoCache([]string{"images"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue())
+		session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+	})
+
+	It("podman pull from local OCI directory", func() {
+		podmanTest.RestoreArtifact(ALPINE)
+		dirpath := filepath.Join(podmanTest.TempDir, "alpine")
+		os.MkdirAll(dirpath, os.ModePerm)
+		imgPath := fmt.Sprintf("oci:%s", dirpath)
+
+		session := podmanTest.PodmanNoCache([]string{"push", "alpine", imgPath})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		session = podmanTest.PodmanNoCache([]string{"pull", imgPath})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		session = podmanTest.PodmanNoCache([]string{"images"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue())
 		session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
diff --git a/vendor/modules.txt b/vendor/modules.txt
index c4a410be6..4b992352c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -75,10 +75,10 @@ github.com/containers/image/storage
 github.com/containers/image/copy
 github.com/containers/image/docker/reference
 github.com/containers/image/docker/tarfile
+github.com/containers/image/oci/layout
 github.com/containers/image/tarball
 github.com/containers/image/pkg/sysregistriesv2
 github.com/containers/image/image
-github.com/containers/image/oci/layout
 github.com/containers/image/directory/explicitfilepath
 github.com/containers/image/docker/policyconfiguration
 github.com/containers/image/pkg/blobinfocache/none