Merge pull request #10025 from zhangguanzhang/remote-save-dir

Fixes podman-remote save to directories does not work
containers · Apr 19, 2021 · a917bae · a917bae
2 parents 6908557 + 21827f6
commit a917bae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
@@ -270,6 +270,16 @@ func ExportImages(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// if format is dir, server will save to an archive
+	// the client will unArchive after receive the archive file
+	// so must convert is at here
+	switch query.Format {
+	case define.OCIManifestDir:
+		query.Format = define.OCIArchive
+	case define.V2s2ManifestDir:
+		query.Format = define.V2s2Archive
+	}
+
 	switch query.Format {
 	case define.V2s2Archive, define.OCIArchive:
 		tmpfile, err := ioutil.TempFile("", "api.tar")

diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go
@@ -79,7 +79,7 @@ var _ = Describe("Podman save", func() {
 	})
 
 	It("podman save to directory with oci format", func() {
-		if rootless.IsRootless() && podmanTest.RemoteTest {
+		if rootless.IsRootless() {
 			Skip("Requires a fix in containers image for chown/lchown")
 		}
 		outdir := filepath.Join(podmanTest.TempDir, "save")
@@ -90,7 +90,7 @@ var _ = Describe("Podman save", func() {
 	})
 
 	It("podman save to directory with v2s2 docker format", func() {
-		if rootless.IsRootless() && podmanTest.RemoteTest {
+		if rootless.IsRootless() {
 			Skip("Requires a fix in containers image for chown/lchown")
 		}
 		outdir := filepath.Join(podmanTest.TempDir, "save")