containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

container: do not chown to dest target with U 

if the 'U' option is provided, do not chown the destination target to
the existing target in the image.

Closes: https://github.com/containers/podman/issues/22224

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-04-03 11:03:02 +02:00
parent 7d68362cf5
commit 519a66c6a9
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/container_internal_common.go
View File

@ -2882,8 +2882,13 @@ func (c *Container) fixVolumePermissions(v *ContainerNamedVolume) error {
return err return err
} }
// Make sure the new volume matches the permissions of the target directory. // Make sure the new volume matches the permissions of the target directory unless 'U' is
// provided (since the volume was already chowned in this case).
// https://github.com/containers/podman/issues/10188 // https://github.com/containers/podman/issues/10188
if slices.Contains(v.Options, "U") {
return nil
}
st, err := os.Lstat(filepath.Join(c.state.Mountpoint, v.Dest)) st, err := os.Lstat(filepath.Join(c.state.Mountpoint, v.Dest))
if err == nil { if err == nil {
if stat, ok := st.Sys().(*syscall.Stat_t); ok { if stat, ok := st.Sys().(*syscall.Stat_t); ok {

6
test/e2e/run_volume_test.go
View File

@ -750,6 +750,12 @@ VOLUME /test/`, ALPINE)
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(ContainSubstring("888:888")) Expect(session.OutputToString()).To(ContainSubstring("888:888"))
// test with an existing directory in the image
session = podmanTest.Podman([]string{"run", "--rm", "--user", "881:882", "-v", "NAMED-VOLUME:/mnt:U", ALPINE, "stat", "-c", "%u:%g", "/mnt"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(ContainSubstring("881:882"))
session = podmanTest.Podman([]string{"run", "--rm", "--user", "888:888", "--userns", "auto", "-v", vol, ALPINE, "stat", "-c", "%u:%g", dest}) session = podmanTest.Podman([]string{"run", "--rm", "--user", "888:888", "--userns", "auto", "-v", vol, ALPINE, "stat", "-c", "%u:%g", dest})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())