diff options
author | Aditya R <arajan@redhat.com> | 2022-07-01 13:49:28 +0530 |
---|---|---|
committer | Aditya R <arajan@redhat.com> | 2022-07-01 14:19:01 +0530 |
commit | d6678adc92b77db13db557a0381beff1c7da8549 (patch) | |
tree | 9b555a4a21b8c8d13f24ca75a1ed18fe32b56a14 | |
parent | 01beba3667851c1dd68d3df1e0aa6bc8cb1ec0eb (diff) | |
download | podman-d6678adc92b77db13db557a0381beff1c7da8549.tar.gz podman-d6678adc92b77db13db557a0381beff1c7da8549.tar.bz2 podman-d6678adc92b77db13db557a0381beff1c7da8549.zip |
overlay,mount: convert lowerdir to absolute path for overlay mounts of path
When mounting paths as overlay mounts we end up passing source as is to
lowerdir options, resolve all relative paths in such cases for overlay
mounts.
Closes: https://github.com/containers/podman/issues/14797
Signed-off-by: Aditya R <arajan@redhat.com>
-rw-r--r-- | pkg/specgen/volumes.go | 8 | ||||
-rw-r--r-- | test/e2e/run_volume_test.go | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go index f272a5c11..5e1ea9a78 100644 --- a/pkg/specgen/volumes.go +++ b/pkg/specgen/volumes.go @@ -139,7 +139,13 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na // This is a overlay volume newOverlayVol := new(OverlayVolume) newOverlayVol.Destination = dest - newOverlayVol.Source = src + // convert src to absolute path so we don't end up passing + // relative values as lowerdir for overlay mounts + source, err := filepath.Abs(src) + if err != nil { + return nil, nil, nil, errors.Wrapf(err, "failed while resolving absolute path for source %v for overlay mount", src) + } + newOverlayVol.Source = source newOverlayVol.Options = options if _, ok := overlayVolumes[newOverlayVol.Destination]; ok { diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index 8cc2a68de..5fcf340d4 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -678,6 +678,15 @@ VOLUME /test/`, ALPINE) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) + // Test overlay mount when lowerdir is relative path. + f, err = os.Create("hello") + Expect(err).To(BeNil(), "os.Create") + f.Close() + session = podmanTest.Podman([]string{"run", "--rm", "-v", ".:/app:O", ALPINE, "ls", "/app"}) + session.WaitWithDefaultTimeout() + Expect(session.OutputToString()).To(ContainSubstring("hello")) + Expect(session).Should(Exit(0)) + // Make sure modifications in container do not show up on host session = podmanTest.Podman([]string{"run", "--rm", "-v", volumeFlag, ALPINE, "touch", "/run/test/container"}) session.WaitWithDefaultTimeout() |