[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] docker.py: add --run-as-current-user
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 1/6] docker.py: add --run-as-current-user |
Date: |
Thu, 22 Aug 2019 17:47:20 +0400 |
(podman will need further tweaks)
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
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 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)
--
2.23.0
- [Qemu-devel] [PULL 0/6] Podman patches, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 1/6] docker.py: add --run-as-current-user,
Marc-André Lureau <=
- [Qemu-devel] [PULL 3/6] tests/docker: add podman support, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 2/6] docker.py: add podman support, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 4/6] tests: specify the address family when checking bind, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 5/6] test-char: skip tcp tests if ipv4 check failed, Marc-André Lureau, 2019/08/22
- [Qemu-devel] [PULL 6/6] test: skip tests if socket_check_protocol_support() failed, Marc-André Lureau, 2019/08/22
- Re: [Qemu-devel] [PULL 0/6] Podman patches, Peter Maydell, 2019/08/23