From 7a2b19664d8fa58984e4870e95398aeebeb08f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytms@tsmail.eu>
Date: Tue, 29 Nov 2022 11:26:31 +0100
Subject: [PATCH 1/2] [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}

From 9e0489f1f1fc38985526af100cd2ee40b5c97c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytms@tsmail.eu>
Date: Tue, 28 Feb 2023 09:43:54 +0100
Subject: [PATCH 2/2] [FIX] upgrade: run pre_migration files

---
 odoo_openupgrade_wizard/cli/cli_upgrade.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/odoo_openupgrade_wizard/cli/cli_upgrade.py b/odoo_openupgrade_wizard/cli/cli_upgrade.py
index ba95ec8..6052344 100644
--- a/odoo_openupgrade_wizard/cli/cli_upgrade.py
+++ b/odoo_openupgrade_wizard/cli/cli_upgrade.py
@@ -12,6 +12,9 @@ from odoo_openupgrade_wizard.tools.tools_odoo import (
     kill_odoo,
     run_odoo,
 )
+from odoo_openupgrade_wizard.tools.tools_postgres import (
+    execute_sql_files_pre_migration,
+)
 
 
 @click.command()
@@ -25,6 +28,7 @@ def upgrade(ctx, first_step, last_step, database):
         ctx, first_step, last_step
     )
     for migration_step in migration_steps:
+        execute_sql_files_pre_migration(ctx, database, migration_step)
         try:
             run_odoo(
                 ctx,