opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes podman-remote save to directories does not work
This commit is contained in:
OpenShift Merge Robot
2021-04-19 10:22:52 -04:00
committed by GitHub
parent 69085570f7 21827f6a0c
commit a917bae67d
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/handlers/libpod/images.go
View File

@ -270,6 +270,16 @@ func ExportImages(w http.ResponseWriter, r *http.Request) {
return 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 { switch query.Format {
case define.V2s2Archive, define.OCIArchive: case define.V2s2Archive, define.OCIArchive:
tmpfile, err := ioutil.TempFile("", "api.tar") tmpfile, err := ioutil.TempFile("", "api.tar")

4
test/e2e/save_test.go
View File

@ -79,7 +79,7 @@ var _ = Describe("Podman save", func() {
}) })
It("podman save to directory with oci format", 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") Skip("Requires a fix in containers image for chown/lchown")
} }
outdir := filepath.Join(podmanTest.TempDir, "save") 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() { 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") Skip("Requires a fix in containers image for chown/lchown")
} }
outdir := filepath.Join(podmanTest.TempDir, "save") outdir := filepath.Join(podmanTest.TempDir, "save")