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

Merge pull request #8119 from matejvasek/cp-extract-flag-fix

Browse Source 
fix: respect "--extract" flag for podman cp
This commit is contained in:
OpenShift Merge Robot
2020-10-26 04:45:02 -04:00
committed by GitHub
parent bce8331528 97d47ef3d5
commit 8f498b52de
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/domain/infra/abi/cp.go
View File

@ -26,7 +26,7 @@ import (
)
func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string, options entities.ContainerCpOptions) (*entities.ContainerCpReport, error) {
var extract bool
extract := options.Extract
srcCtr, srcPath := parsePath(ic.Libpod, source)
destCtr, destPath := parsePath(ic.Libpod, dest)

36
test/e2e/cp_test.go
View File

@ -204,6 +204,42 @@ var _ = Describe("Podman cp", func() {
os.Remove("file.tar")
})
It("podman cp tar --extract", func() {
testctr := "testctr"
setup := podmanTest.RunTopContainer(testctr)
setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0))
session := podmanTest.Podman([]string{"exec", testctr, "mkdir", "/foo"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
path, err := os.Getwd()
Expect(err).To(BeNil())
testDirPath := filepath.Join(path, "TestDir4")
err = os.Mkdir(testDirPath, 0777)
Expect(err).To(BeNil())
defer os.RemoveAll(testDirPath)
f, err := os.Create(filepath.Join(testDirPath, "a.txt"))
Expect(err).To(BeNil())
_, err = f.Write([]byte("Hello World!!!\n"))
f.Close()
cmd := exec.Command("tar", "-cvf", "file.tar", "TestDir4")
exec.Command("tar", "-cvf", "/home/mvasek/file.tar", testDirPath)
_, err = cmd.Output()
Expect(err).To(BeNil())
defer os.Remove("file.tar")
session = podmanTest.Podman([]string{"cp", "--extract", "file.tar", "testctr:/foo/"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session = podmanTest.Podman([]string{"exec", testctr, "cat", "/foo/TestDir4/a.txt"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring("Hello World!!!"))
})
It("podman cp symlink", func() {
session := podmanTest.Podman([]string{"run", "-d", ALPINE, "top"})
session.WaitWithDefaultTimeout()