From c3962fc74a05642ed142b16d4f3e27f9e90b3b92 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Sat, 23 Sep 2023 22:44:34 +0200 Subject: [PATCH] [FIX]Odoo v14 + openupgradelib from git needs specific version of setuptools scm --- odoo/odoo/Dockerfile.ext.14 | 3 ++- odoo/odoo/Dockerfile.openupgrade.14 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/odoo/odoo/Dockerfile.ext.14 b/odoo/odoo/Dockerfile.ext.14 index 6e48e62..103f0d0 100644 --- a/odoo/odoo/Dockerfile.ext.14 +++ b/odoo/odoo/Dockerfile.ext.14 @@ -20,7 +20,8 @@ RUN git clone --depth 1 -b 14.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom WORKDIR /opt/odoo # Addons dependencies -RUN .local/bin/pip3 install --no-cache-dir --user git+https://github.com/OCA/openupgradelib.git@3.3.2 +RUN pip3 install --user --no-cache-dir setuptools-scm==7.1.0 && \ + pip3 install --no-cache-dir --user git+https://github.com/OCA/openupgradelib.git@3.3.2 # Scripts COPY i18n-import.sh upd.sh /opt/odoo/ diff --git a/odoo/odoo/Dockerfile.openupgrade.14 b/odoo/odoo/Dockerfile.openupgrade.14 index 122e2c7..a42a604 100644 --- a/odoo/odoo/Dockerfile.openupgrade.14 +++ b/odoo/odoo/Dockerfile.openupgrade.14 @@ -1,5 +1,6 @@ FROM registry.yaltik.net/odoo:yaltik14 LABEL maintainer="Yaltik - Fabien Bourgeois " -RUN pip3 install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.4.0 && \ +RUN pip3 install --user --no-cache-dir setuptools-scm==7.1.0 && \ + pip3 install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.4.0 && \ git clone --depth 1 -b 14.0 https://github.com/OCA/OpenUpgrade /opt/odoo/extra-addons/openupgrade