From 7a2b19664d8fa58984e4870e95398aeebeb08f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Tue, 29 Nov 2022 11:26:31 +0100 Subject: [PATCH] [FIX] error when killing container --- odoo_openupgrade_wizard/tools/tools_docker.py | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/odoo_openupgrade_wizard/tools/tools_docker.py b/odoo_openupgrade_wizard/tools/tools_docker.py index 6ed53dd..4574f23 100644 --- a/odoo_openupgrade_wizard/tools/tools_docker.py +++ b/odoo_openupgrade_wizard/tools/tools_docker.py @@ -114,17 +114,28 @@ def exec_container(container, command): def kill_container(container_name): client = get_docker_client() - containers = client.containers.list( - all=True, - filters={"name": container_name}, - ) + + try: + containers = client.containers.list( + all=True, + filters={"name": container_name}, + ) + except docker.errors.NotFound as err: + logger.debug(f"Cannot kill container {container_name}: " + str(err)) + containers = [] + for container in containers: if container.status != "exited": logger.debug( "Stop container %s, based on image '%s'." % (container.name, ",".join(container.image.tags)) ) - container.stop() + try: + container.stop() + except docker.errors.NotFound as err: + logger.debug( + f"Cannot kill container {container.name}: " + str(err) + ) # TODO, we should here filter by name # but filters={"name": container_name}