diff options
| author | Marc-André Lureau | 2019-07-12 12:50:52 +0200 |
|---|---|---|
| committer | Marc-André Lureau | 2019-08-22 15:30:25 +0200 |
| commit | 2461d80e6c36dfefdcde1ec8735c317c31895c6b (patch) | |
| tree | 6dc71a0de72aeb136808d3e653269f173d2c17ea /tests | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| download | qemu-2461d80e6c36dfefdcde1ec8735c317c31895c6b.tar.gz qemu-2461d80e6c36dfefdcde1ec8735c317c31895c6b.tar.xz qemu-2461d80e6c36dfefdcde1ec8735c317c31895c6b.zip | |
docker.py: add --run-as-current-user
(podman will need further tweaks)
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docker/Makefile.include | 2 | ||||
| -rwxr-xr-x | tests/docker/docker.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index dbd58e548c..582846a587 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) |