[IMP] VICTORY ! odoo container 1 is communicating with odoo container 2 !
This commit is contained in:
parent
679dc37a0c
commit
8963b3ec59
|
|
@ -67,13 +67,12 @@ def generate_module_analysis(ctx, step, database, modules):
|
|||
)
|
||||
|
||||
# INITIAL : Run odoo for odoorpc
|
||||
run_odoo(
|
||||
initial_container = run_odoo(
|
||||
ctx,
|
||||
initial_step,
|
||||
database=initial_database,
|
||||
detached_container=True,
|
||||
)
|
||||
|
||||
# # INITIAL : install modules to analyse and generate records
|
||||
initial_instance = OdooInstance(ctx, initial_database)
|
||||
initial_modules = (
|
||||
|
|
@ -95,6 +94,9 @@ def generate_module_analysis(ctx, step, database, modules):
|
|||
alternative_xml_rpc_port=alternative_xml_rpc_port,
|
||||
)
|
||||
|
||||
# name of the first odoo instance inside the second odoo instance
|
||||
odoo_initial_host_name = "odoo_initial_instance"
|
||||
|
||||
# FINAL : Run odoo for odoorpc and install modules to analyse
|
||||
run_odoo(
|
||||
ctx,
|
||||
|
|
@ -102,6 +104,7 @@ def generate_module_analysis(ctx, step, database, modules):
|
|||
database=final_database,
|
||||
detached_container=True,
|
||||
alternative_xml_rpc_port=alternative_xml_rpc_port,
|
||||
links={initial_container.name: odoo_initial_host_name},
|
||||
)
|
||||
|
||||
# # FINAL : install modules to analyse and generate records
|
||||
|
|
@ -121,8 +124,8 @@ def generate_module_analysis(ctx, step, database, modules):
|
|||
generate_analysis_files(
|
||||
final_instance,
|
||||
final_step,
|
||||
odoo_initial_host_name,
|
||||
initial_database,
|
||||
ctx.obj["config"]["odoo_host_xmlrpc_port"],
|
||||
)
|
||||
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ def get_installable_odoo_modules(odoo_instance, migraton_step):
|
|||
|
||||
|
||||
def generate_analysis_files(
|
||||
final_odoo_instance, final_step, initial_database, initial_xmlrpc_port
|
||||
final_odoo_instance, final_step, initial_odoo_host, initial_database
|
||||
):
|
||||
logger.info(
|
||||
"Generate analysis files for"
|
||||
|
|
@ -187,8 +187,8 @@ def generate_analysis_files(
|
|||
)
|
||||
proxy_vals = {
|
||||
"name": "Proxy to Previous Release",
|
||||
"server": "localhost",
|
||||
"port": initial_xmlrpc_port,
|
||||
"server": initial_odoo_host,
|
||||
"port": "8069",
|
||||
"database": initial_database,
|
||||
"username": "admin",
|
||||
"password": "admin",
|
||||
|
|
|
|||
|
|
@ -146,6 +146,7 @@ def run_odoo(
|
|||
shell: bool = False,
|
||||
demo: bool = False,
|
||||
alternative_xml_rpc_port: int = False,
|
||||
links: dict = {},
|
||||
):
|
||||
logger.info(
|
||||
"Launching Odoo Container (Release {release}) for {db_text}"
|
||||
|
|
@ -182,6 +183,7 @@ def run_odoo(
|
|||
and alternative_xml_rpc_port
|
||||
or ctx.obj["config"]["odoo_host_xmlrpc_port"]
|
||||
)
|
||||
links.update({ctx.obj["config"]["postgres_container_name"]: "db"})
|
||||
return run_container(
|
||||
get_docker_image_tag(ctx, odoo_version),
|
||||
get_docker_container_name(ctx, migration_step),
|
||||
|
|
@ -193,7 +195,7 @@ def run_odoo(
|
|||
env_path: "/env/",
|
||||
odoo_env_path: "/odoo_env/",
|
||||
},
|
||||
links={ctx.obj["config"]["postgres_container_name"]: "db"},
|
||||
links=links,
|
||||
detach=detached_container,
|
||||
auto_remove=True,
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user