Merge pull request #11958 from cdoern/scp

Podman Image SCP rootful to rootless transfer

1 files changed, 22 insertions, 0 deletions

diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go
index 9fd8d7e27..acea2993d 100644
--- a/test/e2e/image_scp_test.go
+++ b/test/e2e/image_scp_test.go
@@ -22,12 +22,14 @@ var _ = Describe("podman image scp", func() {
 	)
 
 	BeforeEach(func() {
+
 		ConfPath.Value, ConfPath.IsSet = os.LookupEnv("CONTAINERS_CONF")
 		conf, err := ioutil.TempFile("", "containersconf")
 		if err != nil {
 			panic(err)
 		}
 		os.Setenv("CONTAINERS_CONF", conf.Name())
+
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
@@ -38,6 +40,7 @@ var _ = Describe("podman image scp", func() {
 
 	AfterEach(func() {
 		podmanTest.Cleanup()
+
 		os.Remove(os.Getenv("CONTAINERS_CONF"))
 		if ConfPath.IsSet {
 			os.Setenv("CONTAINERS_CONF", ConfPath.Value)
@@ -58,6 +61,25 @@ var _ = Describe("podman image scp", func() {
 		Expect(scp).To(Exit(0))
 	})
 
+	It("podman image scp root to rootless transfer", func() {
+		SkipIfNotRootless("this is a rootless only test, transfering from root to rootless using PodmanAsUser")
+		if IsRemote() {
+			Skip("this test is only for non-remote")
+		}
+		env := os.Environ()
+		img := podmanTest.PodmanAsUser([]string{"image", "pull", ALPINE}, 0, 0, "", env) // pull image to root
+		img.WaitWithDefaultTimeout()
+		Expect(img).To(Exit(0))
+		scp := podmanTest.PodmanAsUser([]string{"image", "scp", "root@localhost::" + ALPINE, "1000:1000@localhost::"}, 0, 0, "", env) //transfer from root to rootless (us)
+		scp.WaitWithDefaultTimeout()
+		Expect(scp).To(Exit(0))
+
+		list := podmanTest.Podman([]string{"image", "list"}) // our image should now contain alpine loaded in from root
+		list.WaitWithDefaultTimeout()
+		Expect(list).To(Exit(0))
+		Expect(list.LineInOutputStartsWith("quay.io/libpod/alpine")).To(BeTrue())
+	})
+
 	It("podman image scp bogus image", func() {
 		if IsRemote() {
 			Skip("this test is only for non-remote")