Enable UID GID persistence in podman

osrf · Nov 15, 2024 · 80a0176 · 80a0176
1 parent 830d70b
commit 80a0176
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/rocker/extensions.py b/src/rocker/extensions.py
@@ -300,6 +300,11 @@ class User(RockerExtension):
     def get_name():
         return 'user'
 
+    def get_docker_args(self, cliargs):
+        if cliargs.get('use_podman', False):
+           return ' --userns=keep-id '
+        return ''
+
     def get_environment_subs(self):
         if not self._env_subs:
             user_vars = ['name', 'uid', 'gid', 'gecos','dir', 'shell']

diff --git a/test/test_extension.py b/test/test_extension.py
@@ -419,6 +419,14 @@ def test_user_extension(self):
         snippet_result = p.get_snippet(user_override_active_cliargs)
         self.assertFalse('-s' in snippet_result)
 
+        user_podman_args = mock_cliargs
+        args_result = p.get_docker_args(user_podman_args)
+        self.assertNotIn('--userns=keep-id', args_result)
+
+        user_podman_args['use_podman'] = True
+        args_result = p.get_docker_args(user_podman_args)
+        self.assertIn('--userns=keep-id', args_result)
+
     @pytest.mark.docker
     def test_user_collisions(self):
         plugins = list_plugins()