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

Merge pull request #9415 from mheon/fix_9354

Browse Source 
Change source path resolution for volume copy-up
This commit is contained in:
OpenShift Merge Robot
2021-02-18 03:13:41 -05:00
committed by GitHub
parent d48f4a0e1f a9d548bf77
commit c3419d2168
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal.go
View File

@ -1644,7 +1644,7 @@ func (c *Container) mountNamedVolume(v *ContainerNamedVolume, mountpoint string)
getOptions := copier.GetOptions{ getOptions := copier.GetOptions{
KeepDirectoryNames: false, KeepDirectoryNames: false,
} }
errChan <- copier.Get(mountpoint, "", getOptions, []string{v.Dest + "/."}, writer) errChan <- copier.Get(srcDir, "", getOptions, []string{"/."}, writer)
}() }()
// Copy, volume side: stream what we've written to the pipe, into // Copy, volume side: stream what we've written to the pipe, into

12
test/e2e/run_volume_test.go
View File

@ -334,6 +334,18 @@ RUN sh -c "cd /etc/apk && ln -s ../../testfile"`
Expect(outputSession.OutputToString()).To(Equal(baselineOutput)) Expect(outputSession.OutputToString()).To(Equal(baselineOutput))
}) })
It("podman named volume copyup of /var", func() {
baselineSession := podmanTest.Podman([]string{"run", "--rm", "-t", "-i", fedoraMinimal, "ls", "/var"})
baselineSession.WaitWithDefaultTimeout()
Expect(baselineSession.ExitCode()).To(Equal(0))
baselineOutput := baselineSession.OutputToString()
outputSession := podmanTest.Podman([]string{"run", "-t", "-i", "-v", "/var", fedoraMinimal, "ls", "/var"})
outputSession.WaitWithDefaultTimeout()
Expect(outputSession.ExitCode()).To(Equal(0))
Expect(outputSession.OutputToString()).To(Equal(baselineOutput))
})
It("podman read-only tmpfs conflict with volume", func() { It("podman read-only tmpfs conflict with volume", func() {
session := podmanTest.Podman([]string{"run", "--rm", "-t", "-i", "--read-only", "-v", "tmp_volume:" + dest, ALPINE, "touch", dest + "/a"}) session := podmanTest.Podman([]string{"run", "--rm", "-t", "-i", "--read-only", "-v", "tmp_volume:" + dest, ALPINE, "touch", dest + "/a"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()