Skip to content

[FIX] Don't rely on PYTHONPATH to install doodbalib #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-banon-tecnativa merged 1 commit into from
Sep 22, 2026
Merged

[FIX] Don't rely on PYTHONPATH to install doodbalib #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions 11.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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/*

Expand Down
10 changes: 5 additions & 5 deletions 12.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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/*

Expand Down
10 changes: 5 additions & 5 deletions 13.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ARG MQT=https://github.com/OCA/maintainer-quality-tools.git
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ENV DB_FILTER=.* \

Check warning on line 12 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (13.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (13.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (13.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (13.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 13.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (13.0, 14, 3.9, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand All @@ -22,7 +22,6 @@
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" \
Expand Down Expand Up @@ -78,12 +77,13 @@
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 \
Expand Down Expand Up @@ -150,7 +150,7 @@
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

Expand Down
10 changes: 5 additions & 5 deletions 14.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_AMD64_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ARG WKHTMLTOPDF_ARM64_CHECKSUM="3344e3a72f4cb4c1218cf48ac5fa9e88bef62aa7fa6f2295be7d5bc1fef100b1"
ENV DB_FILTER=.* \

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (14.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 14.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (14.0, 14, 3.9, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand All @@ -22,7 +22,6 @@
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 \
Expand Down Expand Up @@ -92,12 +91,13 @@
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 \
Expand Down Expand Up @@ -166,7 +166,7 @@
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

Expand Down
10 changes: 5 additions & 5 deletions 15.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ARG WKHTMLTOPDF_VERSION=0.12.5
ARG WKHTMLTOPDF_AMD64_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd'
ARG WKHTMLTOPDF_ARM64_CHECKSUM="3344e3a72f4cb4c1218cf48ac5fa9e88bef62aa7fa6f2295be7d5bc1fef100b1"
ENV DB_FILTER=.* \

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (15.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 12 in 15.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (15.0, 14, 3.9, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand All @@ -22,7 +22,6 @@
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 \
Expand Down Expand Up @@ -92,12 +91,13 @@
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 \
Expand Down Expand Up @@ -166,7 +166,7 @@
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

Expand Down
10 changes: 5 additions & 5 deletions 16.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
ARG FIRST_UID=500
ARG FIRST_GID=500

ENV DB_FILTER=.* \

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (16.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 18 in 16.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (16.0, 14, 3.10, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand All @@ -28,7 +28,6 @@
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 \
Expand Down Expand Up @@ -93,12 +92,13 @@
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 \
Expand Down Expand Up @@ -168,7 +168,7 @@
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

Expand Down
10 changes: 5 additions & 5 deletions 17.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (17.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 17.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (17.0, 15, 3.10, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
DEPTH_DEFAULT=1 \
DEPTH_MERGE=100 \
EMAIL=https://hub.docker.com/r/tecnativa/odoo \
Expand All @@ -27,7 +27,6 @@
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 \
Expand Down Expand Up @@ -92,12 +91,13 @@
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 \
Expand Down Expand Up @@ -167,7 +167,7 @@
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
Expand Down
10 changes: 5 additions & 5 deletions 18.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (18.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 18.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (18.0, 16, 3.10, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
PGHOST_REPLICA=false \
PGPORT_REPLICA=false \
DEPTH_DEFAULT=1 \
Expand All @@ -29,7 +29,6 @@
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 \
Expand Down Expand Up @@ -94,12 +93,13 @@
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 \
Expand Down Expand Up @@ -171,7 +171,7 @@
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
Expand Down
10 changes: 5 additions & 5 deletions 19.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (19.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 17 in 19.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (19.0, 17, 3.12, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
PGHOST_REPLICA=None \
PGPORT_REPLICA=None \
DEPTH_DEFAULT=1 \
Expand All @@ -29,7 +29,6 @@
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 \
Expand Down Expand Up @@ -94,12 +93,13 @@
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 \
Expand Down Expand Up @@ -170,7 +170,7 @@
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

Expand Down
10 changes: 5 additions & 5 deletions 20.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 36 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (20.0, 18, 3.12, amd64)

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
PGHOST_REPLICA=None \
PGPORT_REPLICA=None \
DEPTH_DEFAULT=1 \
Expand All @@ -48,7 +48,6 @@
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 \
Expand Down Expand Up @@ -168,19 +167,20 @@
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
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down