diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-19 10:22:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 10:22:52 -0400 |
| commit | a917bae67d51c8759e65b712437af9e5fbfffd66 (patch) | |
| tree | bc055fcc424827ff9db67ea1684e2b55cc4b5503 | |
| parent | 69085570f7ebbb3768e963e2a6a31d7bb9b4ca16 (diff) | |
| parent | 21827f6a0c03b19fc885b4d8a6cdd4998a75ccb9 (diff) | |
| download | podman-a917bae67d51c8759e65b712437af9e5fbfffd66.tar.gz podman-a917bae67d51c8759e65b712437af9e5fbfffd66.tar.bz2 podman-a917bae67d51c8759e65b712437af9e5fbfffd66.zip | |
Merge pull request #10025 from zhangguanzhang/remote-save-dir
Fixes podman-remote save to directories does not work
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 10 | ||||
| -rw-r--r-- | test/e2e/save_test.go | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 158babcdc..92882cc40 100644 --- 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 index 42ee7440b..69184649f 100644 --- 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") |