Skip to content

Commit 7fadbdd

Browse files
author
Jairo Llopis
committed
Revert "Update Python 3 version in v11 and v12"
This reverts commit dbaaa27 from #290. Also reverts v13 to oldest supported python version (3.6 per the docs). I had to change $PIP_NO_CACHE_DIR in v13. See pypa/pip#5735. @Tecnativa TT23435
1 parent 4401ddd commit 7fadbdd

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

11.0.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.7-stretch AS base
1+
FROM python:3.5-stretch AS base
22

33
EXPOSE 8069 8072
44

@@ -88,17 +88,17 @@ RUN pip install \
8888
geoip2 \
8989
&& sync
9090
COPY bin-deprecated/* bin/* /usr/local/bin/
91-
COPY lib/doodbalib /usr/local/lib/python3.7/site-packages/doodbalib
92-
RUN ln -s /usr/local/lib/python3.7/site-packages/doodbalib \
93-
/usr/local/lib/python3.7/site-packages/odoobaselib
91+
COPY lib/doodbalib /usr/local/lib/python3.5/site-packages/doodbalib
92+
RUN ln -s /usr/local/lib/python3.5/site-packages/doodbalib \
93+
/usr/local/lib/python3.5/site-packages/odoobaselib
9494
COPY build.d common/build.d
9595
COPY conf.d common/conf.d
9696
COPY entrypoint.d common/entrypoint.d
9797
RUN mkdir -p auto/addons auto/geoip custom/src/private \
9898
&& ln /usr/local/bin/direxec common/entrypoint \
9999
&& ln /usr/local/bin/direxec common/build \
100100
&& chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \
101-
&& chmod -R a+rX /usr/local/lib/python3.7/site-packages/doodbalib \
101+
&& chmod -R a+rX /usr/local/lib/python3.5/site-packages/doodbalib \
102102
&& mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \
103103
&& ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \
104104
&& sed -i 's/.*DatabaseDirectory .*$/DatabaseDirectory \/opt\/odoo\/auto\/geoip\//g' /opt/odoo/auto/geoip/GeoIP.conf \
@@ -130,7 +130,7 @@ RUN debs="libldap2-dev libsasl2-dev" \
130130
&& apt-get install -yqq --no-install-recommends $debs \
131131
&& pip install \
132132
-r https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \
133-
&& (python3 -m compileall -q /usr/local/lib/python3.7/ || true) \
133+
&& (python3 -m compileall -q /usr/local/lib/python3.5/ || true) \
134134
&& apt-get purge -yqq $debs \
135135
&& rm -Rf /var/lib/apt/lists/* /tmp/*
136136

12.0.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.7-stretch AS base
1+
FROM python:3.5-stretch AS base
22

33
EXPOSE 8069 8072
44

@@ -84,15 +84,15 @@ RUN pip install \
8484
geoip2 \
8585
&& sync
8686
COPY bin-deprecated/* bin/* /usr/local/bin/
87-
COPY lib/doodbalib /usr/local/lib/python3.7/site-packages/doodbalib
87+
COPY lib/doodbalib /usr/local/lib/python3.5/site-packages/doodbalib
8888
COPY build.d common/build.d
8989
COPY conf.d common/conf.d
9090
COPY entrypoint.d common/entrypoint.d
9191
RUN mkdir -p auto/addons auto/geoip custom/src/private \
9292
&& ln /usr/local/bin/direxec common/entrypoint \
9393
&& ln /usr/local/bin/direxec common/build \
9494
&& chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \
95-
&& chmod -R a+rX /usr/local/lib/python3.7/site-packages/doodbalib \
95+
&& chmod -R a+rX /usr/local/lib/python3.5/site-packages/doodbalib \
9696
&& mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \
9797
&& ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \
9898
&& sed -i 's/.*DatabaseDirectory .*$/DatabaseDirectory \/opt\/odoo\/auto\/geoip\//g' /opt/odoo/auto/geoip/GeoIP.conf \
@@ -126,7 +126,7 @@ RUN debs="libldap2-dev libsasl2-dev" \
126126
-r https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \
127127
phonenumbers \
128128
'websocket-client~=0.53' \
129-
&& (python3 -m compileall -q /usr/local/lib/python3.7/ || true) \
129+
&& (python3 -m compileall -q /usr/local/lib/python3.5/ || true) \
130130
&& apt-get purge -yqq $debs \
131131
&& rm -Rf /var/lib/apt/lists/* /tmp/*
132132

13.0.Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.7-slim-buster AS base
1+
FROM python:3.6-slim-buster AS base
22

33
EXPOSE 8069 8072
44

@@ -19,7 +19,7 @@ ENV DB_FILTER=.* \
1919
NODE_PATH=/usr/local/lib/node_modules:/usr/lib/node_modules \
2020
OPENERP_SERVER=/opt/odoo/auto/odoo.conf \
2121
PATH="/home/odoo/.local/bin:$PATH" \
22-
PIP_NO_CACHE_DIR=1 \
22+
PIP_NO_CACHE_DIR=0 \
2323
PTVSD_ARGS="--host 0.0.0.0 --port 6899 --wait --multiprocess" \
2424
PTVSD_ENABLE=0 \
2525
PUDB_RDB_HOST=0.0.0.0 \
@@ -67,15 +67,15 @@ RUN apt-get -qq update \
6767

6868
WORKDIR /opt/odoo
6969
COPY bin/* /usr/local/bin/
70-
COPY lib/doodbalib /usr/local/lib/python3.7/site-packages/doodbalib
70+
COPY lib/doodbalib /usr/local/lib/python3.6/site-packages/doodbalib
7171
COPY build.d common/build.d
7272
COPY conf.d common/conf.d
7373
COPY entrypoint.d common/entrypoint.d
7474
RUN mkdir -p auto/addons auto/geoip custom/src/private \
7575
&& ln /usr/local/bin/direxec common/entrypoint \
7676
&& ln /usr/local/bin/direxec common/build \
7777
&& chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \
78-
&& chmod -R a+rX /usr/local/lib/python3.7/site-packages/doodbalib \
78+
&& chmod -R a+rX /usr/local/lib/python3.6/site-packages/doodbalib \
7979
&& mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \
8080
&& ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \
8181
&& sed -i 's/.*DatabaseDirectory .*$/DatabaseDirectory \/opt\/odoo\/auto\/geoip\//g' /opt/odoo/auto/geoip/GeoIP.conf \
@@ -115,6 +115,8 @@ RUN build_deps=" \
115115
libsasl2-dev \
116116
libtiff5-dev \
117117
libwebp-dev \
118+
libxml2-dev \
119+
libxslt-dev \
118120
tcl-dev \
119121
tk-dev \
120122
zlib1g-dev \
@@ -135,7 +137,7 @@ RUN build_deps=" \
135137
watchdog \
136138
wdb \
137139
geoip2 \
138-
&& (python3 -m compileall -q /usr/local/lib/python3.7/ || true) \
140+
&& (python3 -m compileall -q /usr/local/lib/python3.6/ || true) \
139141
&& apt-get purge -yqq $build_deps \
140142
&& apt-get autopurge -yqq \
141143
&& rm -Rf /var/lib/apt/lists/* /tmp/*

0 commit comments

Comments
 (0)