diff --git a/odoo_openupgrade_wizard/configuration_version_dependant.py b/odoo_openupgrade_wizard/configuration_version_dependant.py index d379158..38f3a81 100644 --- a/odoo_openupgrade_wizard/configuration_version_dependant.py +++ b/odoo_openupgrade_wizard/configuration_version_dependant.py @@ -26,23 +26,24 @@ _ODOO_VERSION_TEMPLATES = [ { "version": 12.0, "python_major_version": "python3", - "python_minor_version_short": "py37", + # Note: doesn't work with latest available version py37 + "python_minor_version_short": "py36", }, { - "version": 13.0, + "version": 13.0, # OK. "python_major_version": "python3", - "python_minor_version_short": "py37", + # Note: doesn't work with latest available version py37 + "python_minor_version_short": "py36", }, { - "version": 14.0, + "version": 14.0, # OK "python_major_version": "python3", "python_minor_version_short": "py39", }, { - "version": 15.0, + "version": 15.0, # OK "python_major_version": "python3", "python_minor_version_short": "py39", - "python_libraries": ["openupgradelib"], }, ] diff --git a/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 b/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 index 2620928..6a226d4 100644 --- a/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 +++ b/odoo_openupgrade_wizard/templates/odoo/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM ghcr.io/acsone/odoo-bedrock:{{ odoo_version }}-{{python_minor_version_short}}-latest -COPY ./src/odoo /odoo/src/odoo +COPY ./src/odoo/requirements.txt /odoo_requirements.txt COPY debian_requirements.txt /debian_requirements.txt COPY python_requirements.txt /python_requirements.txt @@ -12,6 +12,8 @@ RUN apt-get update || true \ # 3. Install extra Python librairies RUN \ pip install --no-cache-dir \ - -r /odoo/src/odoo/requirements.txt \ - -f https://wheelhouse.acsone.eu/manylinux2014 \ - && pip install -r python_requirements.txt + -r /odoo_requirements.txt \ + -f https://wheelhouse.acsone.eu/manylinux2014\ + && pip install --no-cache-dir \ + -r /python_requirements.txt \ + -f https://wheelhouse.acsone.eu/manylinux2014