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

Merge pull request #25942 from rcmadhankumar/set-default-mount-option

Browse Source 
Remove using `rw` as a default mount option
This commit is contained in:
openshift-merge-bot[bot]
2025-04-25 13:35:29 +00:00
committed by GitHub
parent 2c317bb519 bf7dcd5619
commit ac12341046
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/util/mount_opts.go
View File

@ -191,9 +191,6 @@ func processOptionsInternal(options []string, isTmpfs bool, sourcePath string, g
newOptions = append(newOptions, opt) newOptions = append(newOptions, opt)
} }
if !foundWrite {
newOptions = append(newOptions, "rw")
}
if !foundProp { if !foundProp {
if recursiveBind { if recursiveBind {
newOptions = append(newOptions, "rprivate") newOptions = append(newOptions, "rprivate")

4
pkg/util/utils_test.go
View File

@ -802,13 +802,13 @@ func TestProcessOptions(t *testing.T) {
{ {
name: "default bind mount", name: "default bind mount",
sourcePath: "/path/to/source", sourcePath: "/path/to/source",
expected: []string{"nodev", "nosuid", "rbind", "rprivate", "rw"}, expected: []string{"nodev", "nosuid", "rbind", "rprivate"},
}, },
{ {
name: "default bind mount with bind", name: "default bind mount with bind",
sourcePath: "/path/to/source", sourcePath: "/path/to/source",
options: []string{"bind"}, options: []string{"bind"},
expected: []string{"nodev", "nosuid", "bind", "private", "rw"}, expected: []string{"nodev", "nosuid", "bind", "private"},
}, },
} }

2
test/e2e/play_kube_test.go
View File

@ -5818,7 +5818,7 @@ spec:
podmanTest.PodmanExitCleanly("kube", "play", outputFile) podmanTest.PodmanExitCleanly("kube", "play", outputFile)
inspectCtr2 := podmanTest.PodmanExitCleanly("inspect", "-f", "'{{ .HostConfig.Binds }}'", ctrNameInKubePod) inspectCtr2 := podmanTest.PodmanExitCleanly("inspect", "-f", "'{{ .HostConfig.Binds }}'", ctrNameInKubePod)
Expect(inspectCtr2.OutputToString()).To(ContainSubstring(":" + vol1 + ":rw")) Expect(inspectCtr2.OutputToString()).To(ContainSubstring(":" + vol1))
inspectCtr1 := podmanTest.PodmanExitCleanly("inspect", "-f", "'{{ .HostConfig.Binds }}'", ctr1) inspectCtr1 := podmanTest.PodmanExitCleanly("inspect", "-f", "'{{ .HostConfig.Binds }}'", ctr1)
Expect(inspectCtr2.OutputToString()).To(Equal(inspectCtr1.OutputToString())) Expect(inspectCtr2.OutputToString()).To(Equal(inspectCtr1.OutputToString()))

4
test/python/docker/compat/test_containers.py
View File

@ -265,7 +265,7 @@ class TestContainers(common.DockerTestCase):
has_tried_pull = True has_tried_pull = True
self.assertFalse(has_tried_pull, "the build process has tried tried to pull the base image") self.assertFalse(has_tried_pull, "the build process has tried tried to pull the base image")
def test_mount_rw_by_default(self): def test_mount_options_by_default(self):
ctr: Optional[Container] = None ctr: Optional[Container] = None
vol: Optional[Volume] = None vol: Optional[Volume] = None
@ -282,7 +282,7 @@ class TestContainers(common.DockerTestCase):
ctr_inspect = self.docker.api.inspect_container(ctr.id) ctr_inspect = self.docker.api.inspect_container(ctr.id)
binds: List[str] = ctr_inspect["HostConfig"]["Binds"] binds: List[str] = ctr_inspect["HostConfig"]["Binds"]
self.assertEqual(len(binds), 1) self.assertEqual(len(binds), 1)
self.assertEqual(binds[0], "test-volume:/vol-mnt:rw,rprivate,nosuid,nodev,rbind") self.assertEqual(binds[0], "test-volume:/vol-mnt:rprivate,nosuid,nodev,rbind")
finally: finally:
if ctr is not None: if ctr is not None:
ctr.remove() ctr.remove()

2
test/system/252-quadlet.bats
View File

@ -988,7 +988,7 @@ EOF
service_setup $QUADLET_SERVICE_NAME service_setup $QUADLET_SERVICE_NAME
run_podman container inspect --format '{{index .HostConfig.Tmpfs "/tmpfs1"}}' $QUADLET_CONTAINER_NAME run_podman container inspect --format '{{index .HostConfig.Tmpfs "/tmpfs1"}}' $QUADLET_CONTAINER_NAME
is "$output" "rw,rprivate,nosuid,nodev,tmpcopyup" "regular tmpfs mount" is "$output" "rprivate,nosuid,nodev,tmpcopyup" "regular tmpfs mount"
run_podman container inspect --format '{{index .HostConfig.Tmpfs "/tmpfs2"}}' $QUADLET_CONTAINER_NAME run_podman container inspect --format '{{index .HostConfig.Tmpfs "/tmpfs2"}}' $QUADLET_CONTAINER_NAME
is "$output" "ro,rprivate,nosuid,nodev,tmpcopyup" "read-only tmpfs mount" is "$output" "ro,rprivate,nosuid,nodev,tmpcopyup" "read-only tmpfs mount"