From 63772d5cfda6e1dc1e9f2e17abda8c223fdbdd76 Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 4 Sep 2019 19:24:51 -0400 Subject: [PATCH] tests/docker: Use --userns=keep-id for podman MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Message-Id: <20190904232451.26466-1-jsnow@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/docker.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e23209f71e..064026c8af 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)