Skip to content

Commit

Permalink
[IMP] usar PY 3.12 para localizacion Ecuatoriana
Browse files Browse the repository at this point in the history
  • Loading branch information
celm1990 committed Dec 12, 2024
1 parent 4045065 commit 54ef405
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions 18.0.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim-bookworm AS base
FROM python:3.12-slim-bookworm AS base

EXPOSE 8069 8072

Expand Down Expand Up @@ -86,7 +86,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' >> /e

WORKDIR /opt/odoo
COPY bin/* /usr/local/bin/
COPY lib/doodbalib /usr/local/lib/python3.10/site-packages/doodbalib
COPY lib/doodbalib /usr/local/lib/python3.12/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
Expand All @@ -96,7 +96,7 @@ RUN 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.10/site-packages/doodbalib \
&& chmod -R a+rX /usr/local/lib/python3.12/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 @@ -142,7 +142,7 @@ RUN build_deps=" \
&& apt-get install -yqq --no-install-recommends $build_deps \
&& curl -o requirements.txt https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \
# disable gevent version recommendation from odoo and use 22.10.2 used in debian bookworm as python3-gevent
&& sed -i -E "s/(gevent==)21\.8\.0( ; sys_platform != 'win32' and python_version == '3.10')/\122.10.2\2/;s/(greenlet==)1.1.2( ; sys_platform != 'win32' and python_version == '3.10')/\12.0.2\2/" requirements.txt \
&& sed -i -E "s/(gevent==)21\.8\.0( ; sys_platform != 'win32' and python_version == '3.12')/\122.10.2\2/;s/(greenlet==)1.1.2( ; sys_platform != 'win32' and python_version == '3.12')/\12.0.2\2/" requirements.txt \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand All @@ -162,7 +162,7 @@ RUN build_deps=" \
python-magic \
watchdog \
wdb \
&& (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \
&& (python3 -m compileall -q /usr/local/lib/python3.12/ || true) \
# generate flanker cached tables during install when /usr/local/lib/ is still intended to be written to
# https://github.com/Tecnativa/doodba/issues/486
&& python3 -c 'from flanker.addresslib import address' >/dev/null 2>&1 \
Expand Down

0 comments on commit 54ef405

Please sign in to comment.