On Thu, Sep 17, 2020 at 12:44:41PM +0200, Paolo Bonzini wrote: > Avoid that containers pile up. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > tests/docker/Makefile.include | 1 - > tests/docker/docker.py | 4 ++-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 3daabaa2fd..75704268ff 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -243,7 +243,6 @@ docker-run: docker-qemu-src > $(DOCKER_SCRIPT) run \ > $(if $(NOUSER),,--run-as-current-user) \ > --security-opt seccomp=unconfined \ > - $(if $V,,--rm) \
I guess the intention was that if someone is running verbose they might want to get back into the container after a failure. This is certainly a pain for CI though, because running verbose is desirable but keeping around dead containers is not. The DEBUG=1 option is likely a better general purpose debugging approach than relying on the dead container being left behind, so Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > $(if $(DEBUG),-ti,) \ > $(if $(NETWORK),$(if $(subst > $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ > -e TARGET_LIST=$(subst > $(SPACE),$(COMMA),$(TARGET_LIST)) \ > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index 356d7618f1..36b7868406 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -377,7 +377,7 @@ class Docker(object): > if self._command[0] == "podman": > 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, > quiet=quiet) > if not keep: > @@ -616,7 +616,7 @@ class CcCommand(SubCommand): > if argv and argv[0] == "--": > argv = argv[1:] > cwd = os.getcwd() > - cmd = ["--rm", "-w", cwd, > + cmd = ["-w", cwd, > "-v", "%s:%s:rw" % (cwd, cwd)] > if args.paths: > for p in args.paths: > -- > 2.26.2 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
