ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker.py: always use --rm 

Avoid that containers pile up.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Paolo Bonzini 2020-09-17 12:44:41 +02:00 committed by Peter Maydell
parent a6a0c8394c
commit 17cd6e2bbf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/docker/Makefile.include
View File

@ -243,7 +243,6 @@ docker-run: docker-qemu-src
$(DOCKER_SCRIPT) run \ $(DOCKER_SCRIPT) run \
$(if $(NOUSER),,--run-as-current-user) \ $(if $(NOUSER),,--run-as-current-user) \
--security-opt seccomp=unconfined \ --security-opt seccomp=unconfined \
$(if $V,,--rm) \
$(if $(DEBUG),-ti,) \ $(if $(DEBUG),-ti,) \
$(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
-e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \

4
tests/docker/docker.py
View File

@ -377,7 +377,7 @@ class Docker(object):
if self._command[0] == "podman": if self._command[0] == "podman":
cmd.insert(0, '--userns=keep-id') cmd.insert(0, '--userns=keep-id')
ret = self._do_check(["run", "--label", ret = self._do_check(["run", "--rm", "--label",
"com.qemu.instance.uuid=" + label] + cmd, "com.qemu.instance.uuid=" + label] + cmd,
quiet=quiet) quiet=quiet)
if not keep: if not keep:
@ -616,7 +616,7 @@ class CcCommand(SubCommand):
if argv and argv[0] == "--": if argv and argv[0] == "--":
argv = argv[1:] argv = argv[1:]
cwd = os.getcwd() cwd = os.getcwd()
cmd = ["--rm", "-w", cwd, cmd = ["-w", cwd,
"-v", "%s:%s:rw" % (cwd, cwd)] "-v", "%s:%s:rw" % (cwd, cwd)]
if args.paths: if args.paths:
for p in args.paths: for p in args.paths: