From 429470ee37cc0856f0e8e7620e299db223dc5455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ba=C3=B1=C3=B3n?= Date: Tue, 22 Sep 2026 19:30:11 +0200 Subject: [PATCH] [FIX] Don't rely on PYTHONPATH to install doodbalib --- 11.0.Dockerfile | 14 +++++++------- 12.0.Dockerfile | 10 +++++----- 13.0.Dockerfile | 10 +++++----- 14.0.Dockerfile | 10 +++++----- 15.0.Dockerfile | 10 +++++----- 16.0.Dockerfile | 10 +++++----- 17.0.Dockerfile | 10 +++++----- 18.0.Dockerfile | 10 +++++----- 19.0.Dockerfile | 10 +++++----- 20.0.Dockerfile | 10 +++++----- docker-bake.hcl | 2 +- 11 files changed, 53 insertions(+), 53 deletions(-) diff --git a/11.0.Dockerfile b/11.0.Dockerfile index 7705b501..c6846b27 100644 --- a/11.0.Dockerfile +++ b/11.0.Dockerfile @@ -101,20 +101,20 @@ RUN pip install \ inotify \ && sync COPY legacy/bin/* bin/* /usr/local/bin/ -COPY system_files/var/lib/doodba/doodbalib /usr/local/lib/python3.5/site-packages/doodbalib -RUN ln -s /usr/local/lib/python3.5/site-packages/doodbalib \ - /usr/local/lib/python3.5/site-packages/odoobaselib +COPY system_files/var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib +RUN ln -s /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/odoobaselib COPY system_files/opt/odoo/common/build.d common/build.d COPY system_files/opt/odoo/common/conf.d common/conf.d COPY system_files/opt/odoo/common/entrypoint.d common/entrypoint.d RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /usr/local/lib/python3.5/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -149,7 +149,7 @@ RUN debs="libldap2-dev libsasl2-dev" \ && apt-get install -yqq --no-install-recommends $debs \ && pip install \ -r https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \ - && (python3 -m compileall -q /usr/local/lib/python3.5/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $debs \ && rm -Rf /var/lib/apt/lists/* /tmp/* diff --git a/12.0.Dockerfile b/12.0.Dockerfile index 8b28beb2..0525a4ed 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -95,18 +95,18 @@ RUN pip install \ inotify \ && sync COPY legacy/bin/* bin/* /usr/local/bin/ -COPY system_files/var/lib/doodba/doodbalib /usr/local/lib/python3.5/site-packages/doodbalib +COPY system_files/var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib COPY system_files/opt/odoo/common/build.d common/build.d COPY system_files/opt/odoo/common/conf.d common/conf.d COPY system_files/opt/odoo/common/entrypoint.d common/entrypoint.d RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /usr/local/lib/python3.5/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -143,7 +143,7 @@ RUN debs="libldap2-dev libsasl2-dev" \ -r https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \ phonenumbers \ 'websocket-client~=0.53' \ - && (python3 -m compileall -q /usr/local/lib/python3.5/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $debs \ && rm -Rf /var/lib/apt/lists/* /tmp/* diff --git a/13.0.Dockerfile b/13.0.Dockerfile index 380afb4f..a6a18a88 100644 --- a/13.0.Dockerfile +++ b/13.0.Dockerfile @@ -22,7 +22,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ OPENERP_SERVER=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ PTVSD_ARGS="--host 0.0.0.0 --port 6899 --wait --multiprocess" \ PTVSD_ENABLE=0 \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ @@ -78,12 +77,13 @@ WORKDIR /opt/odoo COPY --from=ctx / / RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -150,7 +150,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD wdb \ geoip2 \ inotify \ - && (python3 -m compileall -q /usr/local/lib/python3.6/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq diff --git a/14.0.Dockerfile b/14.0.Dockerfile index 44d5e5e5..4ec439c3 100644 --- a/14.0.Dockerfile +++ b/14.0.Dockerfile @@ -22,7 +22,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ OPENERP_SERVER=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -92,12 +91,13 @@ WORKDIR /opt/odoo COPY --from=ctx / / RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -166,7 +166,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD python-magic \ watchdog \ wdb \ - && (python3 -m compileall -q /usr/local/lib/python3.8/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq diff --git a/15.0.Dockerfile b/15.0.Dockerfile index fe45cc5b..3ee70b19 100644 --- a/15.0.Dockerfile +++ b/15.0.Dockerfile @@ -22,7 +22,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ OPENERP_SERVER=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -92,12 +91,13 @@ WORKDIR /opt/odoo COPY --from=ctx / / RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -166,7 +166,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD python-magic \ watchdog \ wdb \ - && (python3 -m compileall -q /usr/local/lib/python3.8/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq diff --git a/16.0.Dockerfile b/16.0.Dockerfile index 85e6874f..cd73cd0e 100644 --- a/16.0.Dockerfile +++ b/16.0.Dockerfile @@ -28,7 +28,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ OPENERP_SERVER=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -93,12 +92,13 @@ WORKDIR /opt/odoo COPY --from=ctx / / RUN rm -f /opt/odoo/common/conf.d/60-geoip-ge17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-lt17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -168,7 +168,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD python-magic \ watchdog \ wdb \ - && (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq diff --git a/17.0.Dockerfile b/17.0.Dockerfile index e967dff0..eb2f8918 100644 --- a/17.0.Dockerfile +++ b/17.0.Dockerfile @@ -27,7 +27,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ OPENERP_SERVER=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -92,12 +91,13 @@ WORKDIR /opt/odoo COPY --from=ctx /target / RUN rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-ge17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && rm -f /opt/odoo/common/conf.d/70-database-replica-ge18.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -167,7 +167,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD python-magic \ watchdog \ wdb \ - && (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq # Metadata diff --git a/18.0.Dockerfile b/18.0.Dockerfile index 13bff7db..3ac84c14 100644 --- a/18.0.Dockerfile +++ b/18.0.Dockerfile @@ -29,7 +29,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ OPENERP_SERVER=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -94,12 +93,13 @@ WORKDIR /opt/odoo COPY --from=ctx / / RUN rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-ge17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && mv /opt/odoo/common/conf.d/70-database-replica-ge18.conf /opt/odoo/common/conf.d/70-database-replica.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && mv /opt/odoo/common/conf.d/70-database-replica-ge18.conf /opt/odoo/common/conf.d/70-database-replica.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -171,7 +171,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD python-magic \ watchdog \ wdb \ - && (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq # Metadata diff --git a/19.0.Dockerfile b/19.0.Dockerfile index 8117adfc..86bad1f1 100644 --- a/19.0.Dockerfile +++ b/19.0.Dockerfile @@ -29,7 +29,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ ODOO_RC=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -94,12 +93,13 @@ WORKDIR /opt/odoo COPY --from=ctx / / RUN rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-ge17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && mv /opt/odoo/common/conf.d/70-database-replica-ge18.conf /opt/odoo/common/conf.d/70-database-replica.conf -RUN mkdir -p auto/addons auto/geoip custom/src/private \ + && mv /opt/odoo/common/conf.d/70-database-replica-ge18.conf /opt/odoo/common/conf.d/70-database-replica.conf \ + && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ @@ -170,7 +170,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,id=apt-lists-${TARGETARCH}-${OD wdb \ rlPyCairo \ pycairo \ - && (python3 -m compileall -q /usr/local/lib/python3.12/ || true) \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && apt-get purge -yqq $build_deps \ && apt-get autopurge -yqq diff --git a/20.0.Dockerfile b/20.0.Dockerfile index 385d3b2a..f99f8c77 100644 --- a/20.0.Dockerfile +++ b/20.0.Dockerfile @@ -48,7 +48,6 @@ ENV DB_FILTER=.* \ NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \ ODOO_RC=/opt/odoo/auto/odoo.conf \ PATH="/home/odoo/.local/bin:$PATH" \ - PYTHONPATH="/var/lib/doodba:$PYTHONPATH" \ DEBUGPY_ARGS="--listen 0.0.0.0:6899 --wait-for-client" \ DEBUGPY_ENABLE=0 \ PUDB_RDB_HOST=0.0.0.0 \ @@ -168,19 +167,20 @@ COPY --from=ctx / / COPY --from=qa-builder /qa /qa COPY --from=python-builder /python-install /usr/local WORKDIR /opt/odoo -RUN (python3 -m compileall -q /usr/local/lib/python3.12/ || true) \ - && rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \ +RUN rm -f /opt/odoo/common/conf.d/60-geoip-lt17.conf \ && mv /opt/odoo/common/conf.d/60-geoip-ge17.conf /opt/odoo/common/conf.d/60-geoip.conf \ - && mv /opt/odoo/common/conf.d/70-database-replica-ge18.conf /opt/odoo/common/conf.d/70-database-replica.conf\ + && mv /opt/odoo/common/conf.d/70-database-replica-ge18.conf /opt/odoo/common/conf.d/70-database-replica.conf \ && mkdir -p auto/addons auto/geoip custom/src/private \ && ln /usr/local/bin/direxec common/entrypoint \ && ln /usr/local/bin/direxec common/build \ && chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \ - && chmod -R a+rX /var/lib/doodba \ + && mv /var/lib/doodba/doodbalib /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ + && chmod -R a+rX /usr/local/lib/python${PYTHON_VERSION%.*}/site-packages/doodbalib \ && cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \ && mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \ && ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \ && sed -i 's/.*DatabaseDirectory .*$/DatabaseDirectory \/opt\/odoo\/auto\/geoip\//g' /opt/odoo/auto/geoip/GeoIP.conf \ + && (python3 -m compileall -q /usr/local/lib/python${PYTHON_VERSION%.*}/ || true) \ && sync # Onbuild version, with all the magic diff --git a/docker-bake.hcl b/docker-bake.hcl index 8bf88c01..5ea2594c 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -2,7 +2,7 @@ variable "IMAGE_NAME" { default = "tecnativa/doodba" } variable "VERSIONS" { - default = ["11.0", "12.0", "13.0","14.0","15.0","16.0","17.0","18.0","19.0"] + default = ["11.0", "12.0", "13.0","14.0","15.0","16.0","17.0","18.0","19.0","20.0"] } variable "SUFFIX" { default = ""