diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 419c835..3b532cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,6 @@ pytest: - poetry run pytest --version # Create a postgresql container - - docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo -e POSTGRES_DB=postgres --name db postgres:13 + - docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo -e POSTGRES_DB=postgres --publish 9542:5432 --name db postgres:13 - poetry run pytest --cov odoo_openupgrade_wizard -v diff --git a/odoo_openupgrade_wizard/cli.py b/odoo_openupgrade_wizard/cli.py index c5063e8..bb90ad1 100644 --- a/odoo_openupgrade_wizard/cli.py +++ b/odoo_openupgrade_wizard/cli.py @@ -10,6 +10,7 @@ from odoo_openupgrade_wizard.cli_docker_build import docker_build from odoo_openupgrade_wizard.cli_get_code import get_code from odoo_openupgrade_wizard.cli_init import init from odoo_openupgrade_wizard.cli_run import run +from odoo_openupgrade_wizard.cli_test import test from odoo_openupgrade_wizard.cli_upgrade import upgrade from odoo_openupgrade_wizard.tools_system import ensure_folder_exists @@ -96,3 +97,4 @@ main.add_command(get_code) main.add_command(docker_build) main.add_command(run) main.add_command(upgrade) +main.add_command(test) diff --git a/odoo_openupgrade_wizard/cli_test.py b/odoo_openupgrade_wizard/cli_test.py new file mode 100644 index 0000000..5643143 --- /dev/null +++ b/odoo_openupgrade_wizard/cli_test.py @@ -0,0 +1,17 @@ +import click +import docker +import dockerpty + + +@click.command() +@click.pass_context +def test(ctx): + client = docker.Client() + container = client.create_container( + image="busybox:latest", + stdin_open=True, + tty=True, + command="/bin/sh", + ) + + dockerpty.start(client, container) diff --git a/odoo_openupgrade_wizard/templates.py b/odoo_openupgrade_wizard/templates.py index 9dc4dc0..af16a9c 100644 --- a/odoo_openupgrade_wizard/templates.py +++ b/odoo_openupgrade_wizard/templates.py @@ -1,6 +1,7 @@ CONFIG_YML_TEMPLATE = """project_name: {{ project_name }} -host_odoo_xmlrpc_port: 8069 +host_odoo_xmlrpc_port: 9069 +host_postgres_port: 9432 odoo_versions: {% for odoo_version in odoo_versions %} diff --git a/odoo_openupgrade_wizard/tools_odoo.py b/odoo_openupgrade_wizard/tools_odoo.py index ff9e840..0c0aa1d 100644 --- a/odoo_openupgrade_wizard/tools_odoo.py +++ b/odoo_openupgrade_wizard/tools_odoo.py @@ -161,7 +161,10 @@ def run_odoo( get_docker_image_tag(ctx, odoo_version), get_docker_container_name(ctx, migration_step), command=command, - ports={"8069": 8069, "5432": 5432}, + ports={ + "8069": ctx.obj["config"]["host_odoo_xmlrpc_port"], + "5432": ctx.obj["config"]["host_postgres_port"], + }, volumes=[ "%s:/env/" % (env_path), "%s:/odoo_env/" % (odoo_env_path),