diff mbox series

[PULL,03/45] tests/docker: Use --userns=keep-id for podman

Message ID 20190910084349.28817-4-alex.bennee@linaro.org
State Accepted
Commit 63772d5cfda6e1dc1e9f2e17abda8c223fdbdd76
Headers show
Series testing updates (fixes, upgrades, caching) | expand

Commit Message

Alex Bennée Sept. 10, 2019, 8:43 a.m. UTC 
From: John Snow <jsnow@redhat.com>


The workaround that attempts to accomplish the same result as --userns=keep-id
does not appear to work well with UIDs much above 1000 (like mine, which is
above 20000.)

Since we have official support for this "trick" now, use the supported method.

Signed-off-by: John Snow <jsnow@redhat.com>

Message-Id: <20190904232451.26466-1-jsnow@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.20.1
diff mbox series

Patch

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index e23209f71ee..064026c8af8 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -369,9 +369,7 @@  class RunCommand(SubCommand):
             argv = [ "-u", str(uid) ] + argv
             docker = Docker()
             if docker._command[0] == "podman":
-                argv = [ "--uidmap", "%d:0:1" % uid,
-                         "--uidmap", "0:1:%d" % uid,
-                         "--uidmap", "%d:%d:64536" % (uid + 1, uid + 1)] + argv
+                argv.insert(0, '--userns=keep-id')
         return Docker().run(argv, args.keep, quiet=args.quiet)