mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/docker: Use --userns=keep-id for podman

Browse Source 
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>
This commit is contained in:
John Snow 2019-09-04 19:24:51 -04:00 committed by Alex Bennée
parent 8480517d4c
commit 63772d5cfd
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/docker/docker.py
View File

@ -369,9 +369,7 @@ class RunCommand(SubCommand):
argv = [ "-u", str(uid) ] + argv argv = [ "-u", str(uid) ] + argv
docker = Docker() docker = Docker()
if docker._command[0] == "podman": if docker._command[0] == "podman":
argv = [ "--uidmap", "%d:0:1" % uid, argv.insert(0, '--userns=keep-id')
"--uidmap", "0:1:%d" % uid,
"--uidmap", "%d:%d:64536" % (uid + 1, uid + 1)] + argv
return Docker().run(argv, args.keep, quiet=args.quiet) return Docker().run(argv, args.keep, quiet=args.quiet)