Skip to content
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

Jump to bottom

Revert "Update Python 3 version in v11 and v12" #310

Merged
merged 1 commit into from
May 27, 2020
Merged

Revert "Update Python 3 version in v11 and v12" #310

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
12 changes: 6 additions & 6 deletions 11.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-stretch AS base
FROM python:3.5-stretch AS base

EXPOSE 8069 8072

Expand Down Expand Up @@ -88,17 +88,17 @@ RUN pip install \
geoip2 \
&& sync
COPY bin-deprecated/* bin/* /usr/local/bin/
COPY lib/doodbalib /usr/local/lib/python3.7/site-packages/doodbalib
RUN ln -s /usr/local/lib/python3.7/site-packages/doodbalib \
/usr/local/lib/python3.7/site-packages/odoobaselib
COPY lib/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 build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
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.7/site-packages/doodbalib \
&& chmod -R a+rX /usr/local/lib/python3.5/site-packages/doodbalib \
&& 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 \
Expand Down Expand Up @@ -130,7 +130,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.7/ || true) \
&& (python3 -m compileall -q /usr/local/lib/python3.5/ || true) \
&& apt-get purge -yqq $debs \
&& rm -Rf /var/lib/apt/lists/* /tmp/*

Expand Down
8 changes: 4 additions & 4 deletions 12.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-stretch AS base
FROM python:3.5-stretch AS base

EXPOSE 8069 8072

Expand Down Expand Up @@ -84,15 +84,15 @@ RUN pip install \
geoip2 \
&& sync
COPY bin-deprecated/* bin/* /usr/local/bin/
COPY lib/doodbalib /usr/local/lib/python3.7/site-packages/doodbalib
COPY lib/doodbalib /usr/local/lib/python3.5/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
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.7/site-packages/doodbalib \
&& chmod -R a+rX /usr/local/lib/python3.5/site-packages/doodbalib \
&& 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 \
Expand Down Expand Up @@ -126,7 +126,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.7/ || true) \
&& (python3 -m compileall -q /usr/local/lib/python3.5/ || true) \
&& apt-get purge -yqq $debs \
&& rm -Rf /var/lib/apt/lists/* /tmp/*

Expand Down
12 changes: 7 additions & 5 deletions 13.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-slim-buster AS base
FROM python:3.6-slim-buster AS base

EXPOSE 8069 8072

Expand All @@ -19,7 +19,7 @@ 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" \
PIP_NO_CACHE_DIR=1 \
PIP_NO_CACHE_DIR=0 \
PTVSD_ARGS="--host 0.0.0.0 --port 6899 --wait --multiprocess" \
PTVSD_ENABLE=0 \
PUDB_RDB_HOST=0.0.0.0 \
Expand Down Expand Up @@ -67,15 +67,15 @@ RUN apt-get -qq update \

WORKDIR /opt/odoo
COPY bin/* /usr/local/bin/
COPY lib/doodbalib /usr/local/lib/python3.7/site-packages/doodbalib
COPY lib/doodbalib /usr/local/lib/python3.6/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
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.7/site-packages/doodbalib \
&& chmod -R a+rX /usr/local/lib/python3.6/site-packages/doodbalib \
&& 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 \
Expand Down Expand Up @@ -115,6 +115,8 @@ RUN build_deps=" \
libsasl2-dev \
libtiff5-dev \
libwebp-dev \
libxml2-dev \
libxslt-dev \
tcl-dev \
tk-dev \
zlib1g-dev \
Expand All @@ -135,7 +137,7 @@ RUN build_deps=" \
watchdog \
wdb \
geoip2 \
&& (python3 -m compileall -q /usr/local/lib/python3.7/ || true) \
&& (python3 -m compileall -q /usr/local/lib/python3.6/ || true) \
&& apt-get purge -yqq $build_deps \
&& apt-get autopurge -yqq \
&& rm -Rf /var/lib/apt/lists/* /tmp/*
Expand Down