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

[Qemu-devel] [PATCH] tests/docker: Use --userns=keep-id for podman

John Snow posted 1 patch 4 years, 7 months ago

Download mbox

Test docker-clang@ubuntu failed

Test FreeBSD passed

Test checkpatch passed

Test docker-mingw@fedora passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190904232451.26466-1-jsnow@redhat.com

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Fam Zheng <fam@euphon.net>

tests/docker/docker.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH] tests/docker: Use --userns=keep-id for podman

Posted by John Snow 4 years, 7 months ago

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>
---
 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 ac5baab4ca..fe17d5f709 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -368,9 +368,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)
 
 
-- 
2.21.0

Re: [Qemu-devel] [PATCH] tests/docker: Use --userns=keep-id for podman

Posted by Alex Bennée 4 years, 7 months ago

John Snow <jsnow@redhat.com> writes:

> 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>

Queued to testing/next, thanks.

> ---
>  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 ac5baab4ca..fe17d5f709 100755
> --- a/tests/docker/docker.py
> +++ b/tests/docker/docker.py
> @@ -368,9 +368,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)


--
Alex Bennée