Skip to content

Commit c04428a

Browse files
jhernanderanco74
authored andcommitted
Don't use shared bind mounts
Currently podman is invoked with options to mount both the workspace directory and some of the files it contains. For example, if the workspace is `/root`: ``` -v /root/.netrc:/root/.netrc:ro -v /root:/root:rw,shared ``` The workspace directory is mounted using the _shared_ option. This results in leaking mount points at an exponential rate, as descrived in this _podman_ issue (no closed, as it is the expected behaviour): containers/podman#15671 This _shared_ option is not really needed. This patch removes it. Signed-off-by: Juan Hernandez <[email protected]>
1 parent d8587cc commit c04428a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

skipper/runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def handle_volumes_bind_mount(docker_cmd, homedir, volumes, workspace):
138138

139139
if utils.get_runtime_command() == utils.PODMAN:
140140
volumes.extend([
141-
'%(workspace)s:%(workspace)s:rw,shared' % dict(workspace=workspace),
141+
'%(workspace)s:%(workspace)s:rw' % dict(workspace=workspace),
142142
'%s:/opt/skipper/skipper-entrypoint.sh:rw' % utils.get_extra_file("skipper-entrypoint.sh"),
143143
])
144144
if os.path.exists('/var/run/docker.sock'):

tests/test_runner_podman.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_run_simple_command_nested_network_exist(self, resource_filename_mock, c
8686
'-v', get_volume_mapping('%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR)),
8787
'-v', get_volume_mapping('%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=HOME_DIR)),
8888
'-v', get_volume_mapping('/etc/docker:/etc/docker:ro'),
89-
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw,shared' % dict(workdir=WORKDIR)),
89+
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw' % dict(workdir=WORKDIR)),
9090
'-v', get_volume_mapping('entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:rw'),
9191
'-v', get_volume_mapping('/var/run/docker.sock:/var/run/docker.sock:rw'),
9292
'-v', get_volume_mapping('/var/lib/osmosis:/var/lib/osmosis:rw'),
@@ -127,7 +127,7 @@ def test_run_simple_command_nested_network_not_exist(self, resource_filename_moc
127127
'-v', get_volume_mapping('%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR)),
128128
'-v', get_volume_mapping('%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=HOME_DIR)),
129129
'-v', get_volume_mapping('/etc/docker:/etc/docker:ro'),
130-
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw,shared' % dict(workdir=WORKDIR)),
130+
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw' % dict(workdir=WORKDIR)),
131131
'-v', get_volume_mapping('entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:rw'),
132132
'-v', get_volume_mapping('/var/run/docker.sock:/var/run/docker.sock:rw'),
133133
'-v', get_volume_mapping('/var/lib/osmosis:/var/lib/osmosis:rw'),
@@ -168,7 +168,7 @@ def test_run_complex_command_nested(self, resource_filename_mock, check_output_m
168168
'-v', get_volume_mapping('%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR)),
169169
'-v', get_volume_mapping('%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=HOME_DIR)),
170170
'-v', get_volume_mapping('/etc/docker:/etc/docker:ro'),
171-
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw,shared' % dict(workdir=WORKDIR)),
171+
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw' % dict(workdir=WORKDIR)),
172172
'-v', get_volume_mapping('entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:rw'),
173173
'-v', get_volume_mapping('/var/run/docker.sock:/var/run/docker.sock:rw'),
174174
'-v', get_volume_mapping('/var/lib/osmosis:/var/lib/osmosis:rw'),
@@ -213,7 +213,7 @@ def test_run_non_existent_unauthorized_volume(self, resource_filename_mock,
213213
'-v', get_volume_mapping('%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR)),
214214
'-v', get_volume_mapping('%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=HOME_DIR)),
215215
'-v', get_volume_mapping('/etc/docker:/etc/docker:ro'),
216-
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw,shared' % dict(workdir=WORKDIR)),
216+
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw' % dict(workdir=WORKDIR)),
217217
'-v', get_volume_mapping('entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:rw'),
218218
'-v', get_volume_mapping('/var/run/docker.sock:/var/run/docker.sock:rw'),
219219
'-v', get_volume_mapping('/var/lib/osmosis:/var/lib/osmosis:rw'),
@@ -256,7 +256,7 @@ def test_run_complex_command_nested_with_env(self, resource_filename_mock, check
256256
'-v', get_volume_mapping('%(homedir)s/.gitconfig:%(homedir)s/.gitconfig:ro' % dict(homedir=HOME_DIR)),
257257
'-v', get_volume_mapping('%(homedir)s/.docker/config.json:%(homedir)s/.docker/config.json:ro' % dict(homedir=HOME_DIR)),
258258
'-v', get_volume_mapping('/etc/docker:/etc/docker:ro'),
259-
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw,shared' % dict(workdir=WORKDIR)),
259+
'-v', get_volume_mapping('%(workdir)s:%(workdir)s:rw' % dict(workdir=WORKDIR)),
260260
'-v', get_volume_mapping('entrypoint.sh:/opt/skipper/skipper-entrypoint.sh:rw'),
261261
'-v', get_volume_mapping('/var/run/docker.sock:/var/run/docker.sock:rw'),
262262
'-v', get_volume_mapping('/var/lib/osmosis:/var/lib/osmosis:rw'),

0 commit comments

Comments
 (0)