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

Merge pull request #16498 from vrothberg/fix-16421

Browse Source 
podman cp: fix copying with "." suffix
This commit is contained in:
OpenShift Merge Robot
2022-11-14 13:46:44 +00:00
committed by GitHub
parent e656cf43fe 3371c9d25e
commit 94e34cc795
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/containers/cp.go
View File

@ -158,7 +158,7 @@ func copyContainerToContainer(sourceContainer string, sourcePath string, destCon
// Hence, whenever "." is the source and the destination does not // Hence, whenever "." is the source and the destination does not
// exist, we copy the source's parent and let the copier package create // exist, we copy the source's parent and let the copier package create
// the destination via the Rename option. // the destination via the Rename option.
if destResolvedToParentDir && sourceContainerInfo.IsDir && strings.HasSuffix(sourcePath, ".") { if destResolvedToParentDir && sourceContainerInfo.IsDir && filepath.Base(sourcePath) == "." {
sourceContainerTarget = filepath.Dir(sourceContainerTarget) sourceContainerTarget = filepath.Dir(sourceContainerTarget)
} }
@ -261,7 +261,7 @@ func copyFromContainer(container string, containerPath string, hostPath string)
// we copy the source's parent and let the copier package create the // we copy the source's parent and let the copier package create the
// destination via the Rename option. // destination via the Rename option.
containerTarget := containerInfo.LinkTarget containerTarget := containerInfo.LinkTarget
if resolvedToHostParentDir && containerInfo.IsDir && strings.HasSuffix(containerTarget, ".") { if resolvedToHostParentDir && containerInfo.IsDir && filepath.Base(containerTarget) == "." {
containerTarget = filepath.Dir(containerTarget) containerTarget = filepath.Dir(containerTarget)
} }
@ -365,7 +365,7 @@ func copyToContainer(container string, containerPath string, hostPath string) er
// exist, we copy the source's parent and let the copier package create // exist, we copy the source's parent and let the copier package create
// the destination via the Rename option. // the destination via the Rename option.
hostTarget := hostInfo.LinkTarget hostTarget := hostInfo.LinkTarget
if containerResolvedToParentDir && hostInfo.IsDir && strings.HasSuffix(hostTarget, ".") { if containerResolvedToParentDir && hostInfo.IsDir && filepath.Base(hostTarget) == "." {
hostTarget = filepath.Dir(hostTarget) hostTarget = filepath.Dir(hostTarget)
} }

38
test/system/065-cp.bats
View File

@ -1047,6 +1047,44 @@ ${randomcontent[1]}" "$description"
run_podman rm -t 0 -f ctr-file ctr-dir run_podman rm -t 0 -f ctr-file ctr-dir
} }
@test "podman cp - dot notation - host to container" {
srcdir=$PODMAN_TMPDIR/src
mkdir -p $srcdir
mkdir -p $srcdir/test1. $srcdir/test2
touch $srcdir/test1./file1 $srcdir/test2/file2
run_podman run -d --name=test-ctr --rm $IMAGE sleep infinity
run_podman cp $srcdir/test1. test-ctr:/tmp/foo
run_podman exec test-ctr stat /tmp/foo/file1
run_podman rm -f -t0 test-ctr
}
@test "podman cp - dot notation - container to host" {
dstdir=$PODMAN_TMPDIR/dst
mkdir -p $dstdir
run_podman run -d --name=test-ctr --rm $IMAGE sh -c "mkdir -p /foo/test1. /foo/test2; touch /foo/test1./file1 /foo/test2/file2; sleep infinity"
run_podman cp test-ctr:/foo/test1. $dstdir/foo
run stat $dstdir/foo/test1.
if [[ -e $dstdir/foo/test2 ]]; then
die "the test2 directory should not have been copied over"
fi
run_podman rm -f -t0 test-ctr
}
@test "podman cp - dot notation - container to container" {
run_podman run -d --name=src-ctr --rm $IMAGE sh -c "mkdir -p /foo/test1. /foo/test2; touch /foo/test1./file1 /foo/test2/file2; sleep infinity"
run_podman run -d --name=dest-ctr --rm $IMAGE sleep infinity
run_podman cp src-ctr:/foo/test1. dest-ctr:/foo
run_podman exec dest-ctr find /foo
run_podman exec dest-ctr stat /foo/file1
run_podman rm -f -t0 src-ctr dest-ctr
}
function teardown() { function teardown() {
# In case any test fails, clean up the container we left behind # In case any test fails, clean up the container we left behind
run_podman rm -t 0 -f --ignore cpcontainer run_podman rm -t 0 -f --ignore cpcontainer