Marc-André Lureau <marcandre.lur...@redhat.com> writes:
> Podman will need further tweaks.
>
> Suggested-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> tests/docker/Makefile.include | 2 +-
> tests/docker/docker.py | 5 +++++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index aaf5396b85..f4226b79d0 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -212,7 +212,7 @@ docker-run: docker-qemu-src
> " COPYING $(EXECUTABLE) to $(IMAGE)"))
> $(call quiet-command, \
> $(DOCKER_SCRIPT) run \
> - $(if $(NOUSER),,-u $(shell id -u)) \
> + $(if $(NOUSER),,--run-as-current-user) \
> --security-opt seccomp=unconfined \
> $(if $V,,--rm) \
> $(if $(DEBUG),-ti,) \
> diff --git a/tests/docker/docker.py b/tests/docker/docker.py
> index 53a8c9c801..f15545aeea 100755
> --- a/tests/docker/docker.py
> +++ b/tests/docker/docker.py
> @@ -333,8 +333,13 @@ class RunCommand(SubCommand):
> def args(self, parser):
> parser.add_argument("--keep", action="store_true",
> help="Don't remove image when command completes")
> + parser.add_argument("--run-as-current-user", action="store_true",
> + help="Run container using the current user's
> uid")
>
> def run(self, args, argv):
> + if args.run_as_current_user:
> + uid = os.getuid()
> + argv = [ "-u", str(uid) ] + argv
> return Docker().run(argv, args.keep, quiet=args.quiet)
--
Alex Bennée
