From 11e6607802f06fa4ff0113ddb1edaae2fdb24845 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Fri, 6 May 2022 15:21:11 +0200
Subject: [PATCH] [REF] refactor docker 'ports' args

---
 odoo_openupgrade_wizard/tools_docker.py   | 14 +++++---------
 odoo_openupgrade_wizard/tools_odoo.py     |  9 ++++++---
 odoo_openupgrade_wizard/tools_postgres.py |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/odoo_openupgrade_wizard/tools_docker.py b/odoo_openupgrade_wizard/tools_docker.py
index 8e119da..d131a78 100644
--- a/odoo_openupgrade_wizard/tools_docker.py
+++ b/odoo_openupgrade_wizard/tools_docker.py
@@ -26,7 +26,7 @@ def run_container(
     image_name,
     container_name,
     command=None,
-    ports=False,
+    ports={},
     volumes={},
     environments={},
     links={},
@@ -37,13 +37,9 @@ def run_container(
 
     logger.debug("Launching Docker container named %s ..." % (image_name))
     debug_docker_command = "docker run --name %s\\\n" % (container_name)
-    if ports:
-        for internal_port, host_port in ports.items():
-            debug_docker_command += (
-                " --publish {host_port}:{internal_port}\\\n".format(
-                    internal_port=internal_port, host_port=host_port
-                )
-            )
+
+    for k, v in ports.items():
+        debug_docker_command += " --publish {k}={v}\\\n".format(k=k, v=v)
     for k, v in volumes.items():
         debug_docker_command += " --volume {k}:{v}\\\n".format(
             k=str(k), v=str(v)
@@ -65,7 +61,7 @@ def run_container(
         image_name,
         name=container_name,
         command=command,
-        ports=ports,
+        ports={x: y for y, x in ports.items()},
         volumes=[str(k) + ":" + str(v) for k, v in volumes.items()],
         environment=environments,
         links=links,
diff --git a/odoo_openupgrade_wizard/tools_odoo.py b/odoo_openupgrade_wizard/tools_odoo.py
index 1fec05f..b5ab8f0 100644
--- a/odoo_openupgrade_wizard/tools_odoo.py
+++ b/odoo_openupgrade_wizard/tools_odoo.py
@@ -177,14 +177,17 @@ def run_odoo(
         demo=demo,
     )
 
+    host_xmlrpc_port = (
+        alternative_xml_rpc_port
+        and alternative_xml_rpc_port
+        or ctx.obj["config"]["odoo_host_xmlrpc_port"]
+    )
     return run_container(
         get_docker_image_tag(ctx, odoo_version),
         get_docker_container_name(ctx, migration_step),
         command=command,
         ports={
-            "8069": alternative_xml_rpc_port
-            and alternative_xml_rpc_port
-            or ctx.obj["config"]["odoo_host_xmlrpc_port"],
+            host_xmlrpc_port: 8069,
         },
         volumes={
             env_path: "/env/",
diff --git a/odoo_openupgrade_wizard/tools_postgres.py b/odoo_openupgrade_wizard/tools_postgres.py
index 04276be..7f41cac 100644
--- a/odoo_openupgrade_wizard/tools_postgres.py
+++ b/odoo_openupgrade_wizard/tools_postgres.py
@@ -24,7 +24,7 @@ def get_postgres_container(ctx):
         image_name,
         container_name,
         ports={
-            "5432": ctx.obj["config"]["postgres_host_port"],
+            ctx.obj["config"]["postgres_host_port"]: 5432,
         },
         environments={
             "POSTGRES_USER": "odoo",