From acb02fd9cca203accf924537cfb379c3328d31e9 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Fri, 1 Jul 2022 13:38:59 +0200 Subject: [PATCH] wip de chez wip --- odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 | 5 ++--- tests/data/output_expected/config.yml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 b/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 index 9f57073..e673b17 100644 --- a/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 +++ b/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 @@ -10,6 +10,5 @@ RUN apt-get update || true \ && rm -rf /var/lib/apt/lists/* # 3. Install extra Python librairies -RUN \ - pip install --no-cache-dir -r /odoo_requirements.txt -f {{ prebuild_wheel_url }} \ - && pip install --no-cache-dir -r /python_requirements.txt +RUN /odoo/bin/pip install --no-cache-dir -r /odoo_requirements.txt -f {{ prebuild_wheel_url }} +RUN odoo/bin/pip install --no-cache-dir -r /python_requirements.txt diff --git a/tests/data/output_expected/config.yml b/tests/data/output_expected/config.yml index a553e4a..a5f0429 100644 --- a/tests/data/output_expected/config.yml +++ b/tests/data/output_expected/config.yml @@ -1,8 +1,8 @@ -project_name: test-cli +project_name: test-cli-2 postgres_image_name: postgres:13 -postgres_container_name: test-cli-container-postgres -postgres_volume_name: test-cli-volume-postgres +postgres_container_name: test-cli-2-container-postgres +postgres_volume_name: test-cli-2-volume-postgres odoo_host_xmlrpc_port: 9069 odoo_default_country_code: FR