diff --git a/pkg/util/mount_opts.go b/pkg/util/mount_opts.go index c9a773093e..4e37fd74a0 100644 --- a/pkg/util/mount_opts.go +++ b/pkg/util/mount_opts.go @@ -191,9 +191,6 @@ func processOptionsInternal(options []string, isTmpfs bool, sourcePath string, g newOptions = append(newOptions, opt) } - if !foundWrite { - newOptions = append(newOptions, "rw") - } if !foundProp { if recursiveBind { newOptions = append(newOptions, "rprivate") diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go index b582b51ecc..524f1f0250 100644 --- a/pkg/util/utils_test.go +++ b/pkg/util/utils_test.go @@ -802,13 +802,13 @@ func TestProcessOptions(t *testing.T) { { name: "default bind mount", sourcePath: "/path/to/source", - expected: []string{"nodev", "nosuid", "rbind", "rprivate", "rw"}, + expected: []string{"nodev", "nosuid", "rbind", "rprivate"}, }, { name: "default bind mount with bind", sourcePath: "/path/to/source", options: []string{"bind"}, - expected: []string{"nodev", "nosuid", "bind", "private", "rw"}, + expected: []string{"nodev", "nosuid", "bind", "private"}, }, } diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 98f8e0e1d6..6902d51178 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -5818,7 +5818,7 @@ spec: podmanTest.PodmanExitCleanly("kube", "play", outputFile) 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) Expect(inspectCtr2.OutputToString()).To(Equal(inspectCtr1.OutputToString())) diff --git a/test/python/docker/compat/test_containers.py b/test/python/docker/compat/test_containers.py index cb2c5f340b..138372fafd 100644 --- a/test/python/docker/compat/test_containers.py +++ b/test/python/docker/compat/test_containers.py @@ -265,7 +265,7 @@ class TestContainers(common.DockerTestCase): has_tried_pull = True 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 vol: Optional[Volume] = None @@ -282,7 +282,7 @@ class TestContainers(common.DockerTestCase): ctr_inspect = self.docker.api.inspect_container(ctr.id) binds: List[str] = ctr_inspect["HostConfig"]["Binds"] 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: if ctr is not None: ctr.remove() diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats index 38da54e592..6a7cf884de 100644 --- a/test/system/252-quadlet.bats +++ b/test/system/252-quadlet.bats @@ -988,7 +988,7 @@ EOF service_setup $QUADLET_SERVICE_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 is "$output" "ro,rprivate,nosuid,nodev,tmpcopyup" "read-only tmpfs mount"