diff options
| author | Matthew Heon <mheon@redhat.com> | 2021-02-10 09:46:12 -0500 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-02-10 14:21:37 -0500 |
| commit | ea910fc53537d8c6f8cd1e1eaad49eaa5906c5f5 (patch) | |
| tree | eb8c9c48634c82617b83ac09b316c0ed57fc64e9 /test | |
| parent | 763d522983b819ecd38689c9c0840069d1e2b530 (diff) | |
| download | podman-ea910fc53537d8c6f8cd1e1eaad49eaa5906c5f5.tar.gz podman-ea910fc53537d8c6f8cd1e1eaad49eaa5906c5f5.tar.bz2 podman-ea910fc53537d8c6f8cd1e1eaad49eaa5906c5f5.zip | |
Rewrite copy-up to use buildah Copier
The old copy-up implementation was very unhappy with symlinks,
which could cause containers to fail to start for unclear reasons
when a directory we wanted to copy-up contained one. Rewrite to
use the Buildah Copier, which is more recent and should be both
safer and less likely to blow up over links.
At the same time, fix a deadlock in copy-up for volumes requiring
mounting - the Mountpoint() function tried to take the
already-acquired volume lock.
Fixes #6003
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_volume_test.go | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index bc89b59de..19d82c974 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -304,6 +304,24 @@ var _ = Describe("Podman run with volumes", func() { Expect(separateVolumeSession.OutputToString()).To(Equal(baselineOutput)) }) + It("podman named volume copyup symlink", func() { + imgName := "testimg" + dockerfile := `FROM alpine +RUN touch /testfile +RUN sh -c "cd /etc/apk && ln -s ../../testfile"` + podmanTest.BuildImage(dockerfile, imgName, "false") + + baselineSession := podmanTest.Podman([]string{"run", "--rm", "-t", "-i", imgName, "ls", "/etc/apk/"}) + baselineSession.WaitWithDefaultTimeout() + Expect(baselineSession.ExitCode()).To(Equal(0)) + baselineOutput := baselineSession.OutputToString() + + outputSession := podmanTest.Podman([]string{"run", "-t", "-i", "-v", "/etc/apk/", imgName, "ls", "/etc/apk/"}) + outputSession.WaitWithDefaultTimeout() + Expect(outputSession.ExitCode()).To(Equal(0)) + Expect(outputSession.OutputToString()).To(Equal(baselineOutput)) + }) + 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.WaitWithDefaultTimeout() |