Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[FIX] 11.0-13.0: install phonenumbers and use slim images

Browse Source 
While phonenumbers is not required to run Odoo, it's a requested nice to
have.

To avoid a red warning while installing num2words with pip, the Debian
backport repository is used.

Also use Debian slim images to gain some space.

closes #245 and closes #168
This commit is contained in:
Christophe Monniez 2019-10-09 14:25:19 +02:00 committed by Christophe Monniez
parent 6ba07c93c3
commit 9409487426
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
11.0/Dockerfile
View File

@ -1,9 +1,12 @@
FROM debian:stretch FROM debian:stretch-slim
MAINTAINER Odoo S.A. <info@odoo.com> MAINTAINER Odoo S.A. <info@odoo.com>
# Generate locale C.UTF-8 for postgres and general locale data # Generate locale C.UTF-8 for postgres and general locale data
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# Use backports to avoid install some libs with pip
RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN set -x; \ RUN set -x; \
apt-get update \ apt-get update \
@ -15,13 +18,16 @@ RUN set -x; \
gnupg \ gnupg \
libssl1.0-dev \ libssl1.0-dev \
node-less \ node-less \
python3-num2words \
python3-pip \ python3-pip \
python3-phonenumbers \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
python3-renderpm \ python3-renderpm \
python3-setuptools \ python3-setuptools \
python3-vobject \ python3-vobject \
python3-watchdog \ python3-watchdog \
python3-xlwt \
xz-utils \ xz-utils \
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
@ -55,7 +61,6 @@ RUN set -x; \
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
RUN pip3 install num2words xlwt
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
COPY ./odoo.conf /etc/odoo/ COPY ./odoo.conf /etc/odoo/
RUN chown odoo /etc/odoo/odoo.conf RUN chown odoo /etc/odoo/odoo.conf

9
12.0/Dockerfile
View File

@ -1,9 +1,12 @@
FROM debian:stretch FROM debian:stretch-slim
MAINTAINER Odoo S.A. <info@odoo.com> MAINTAINER Odoo S.A. <info@odoo.com>
# Generate locale C.UTF-8 for postgres and general locale data # Generate locale C.UTF-8 for postgres and general locale data
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# Use backports to avoid install some libs with pip
RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN set -x; \ RUN set -x; \
apt-get update \ apt-get update \
@ -15,13 +18,16 @@ RUN set -x; \
gnupg \ gnupg \
libssl1.0-dev \ libssl1.0-dev \
node-less \ node-less \
python3-num2words \
python3-pip \ python3-pip \
python3-phonenumbers \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
python3-renderpm \ python3-renderpm \
python3-setuptools \ python3-setuptools \
python3-vobject \ python3-vobject \
python3-watchdog \ python3-watchdog \
python3-xlwt \
xz-utils \ xz-utils \
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
@ -69,7 +75,6 @@ RUN set -x; \
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
RUN pip3 install num2words xlwt
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
COPY ./odoo.conf /etc/odoo/ COPY ./odoo.conf /etc/odoo/
RUN chown odoo /etc/odoo/odoo.conf RUN chown odoo /etc/odoo/odoo.conf

6
13.0/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:buster FROM debian:buster-slim
MAINTAINER Odoo S.A. <info@odoo.com> MAINTAINER Odoo S.A. <info@odoo.com>
# Generate locale C.UTF-8 for postgres and general locale data # Generate locale C.UTF-8 for postgres and general locale data
@ -16,13 +16,16 @@ RUN set -x; \
libssl-dev \ libssl-dev \
node-less \ node-less \
npm \ npm \
python3-num2words \
python3-pip \ python3-pip \
python3-phonenumbers \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
python3-renderpm \ python3-renderpm \
python3-setuptools \ python3-setuptools \
python3-vobject \ python3-vobject \
python3-watchdog \ python3-watchdog \
python3-xlwt \
xz-utils \ xz-utils \
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
@ -60,7 +63,6 @@ RUN set -x; \
&& rm -rf /var/lib/apt/lists/* odoo.deb && rm -rf /var/lib/apt/lists/* odoo.deb
# Copy entrypoint script and Odoo configuration file # Copy entrypoint script and Odoo configuration file
RUN pip3 install num2words xlwt
COPY ./entrypoint.sh / COPY ./entrypoint.sh /
COPY ./odoo.conf /etc/odoo/ COPY ./odoo.conf /etc/odoo/
RUN chown odoo /etc/odoo/odoo.conf RUN chown odoo /etc/odoo/odoo.conf