diff --git a/odoo/odoo/Dockerfile.py3o.10 b/odoo/odoo/Dockerfile.py3o.10 new file mode 100644 index 0000000..e2fba51 --- /dev/null +++ b/odoo/odoo/Dockerfile.py3o.10 @@ -0,0 +1,18 @@ +FROM registry.yaltik.net/odoo:yaltik10 +MAINTAINER Yaltik - Fabien Bourgeois + +# Install local LibreOffice for better conversion and supported types (bpo version) +USER root +RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list.d/backports.list +RUN apt-get update && apt-get install --no-install-recommends -t jessie-backports -y libreoffice libreoffice-calc libreoffice-writer +USER odoo + +WORKDIR /opt/odoo/extra-addons +# reporting engine with recent hbrun MR +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine && \ + cd reporting-engine && \ + git fetch origin pull/180/head:10.0-bypass-fusion && git checkout 10.0-bypass-fusion +# Addons dependencies +RUN pip install --user py3o.template && pip install --user py3o.formats + +WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.py3o.10.dev b/odoo/odoo/Dockerfile.py3o.10.dev new file mode 100644 index 0000000..8d6d37e --- /dev/null +++ b/odoo/odoo/Dockerfile.py3o.10.dev @@ -0,0 +1,7 @@ +FROM registry.yaltik.net/odoo:yaltikpy3o10 +MAINTAINER Yaltik - Fabien Bourgeois + +RUN pip install --user watchdog +COPY shell10.sh ./ +COPY launch10.dev.sh ./launch10.sh +ENV DEV 1 diff --git a/odoo/py3o.yml b/odoo/py3o.yml new file mode 100644 index 0000000..331a4a7 --- /dev/null +++ b/odoo/py3o.yml @@ -0,0 +1,37 @@ +version: '2.2' +services: + + odoopy3o10: + init: true + build: + context: ./odoo + dockerfile: Dockerfile.py3o.10 + image: registry.yaltik.net/odoo:yaltikpy3o10 + environment: + DB_MAXCONN: 20 + XMLRPC_PORT: 8069 + LONGPOLLING_PORT: 8072 + WORKERS: 2 + LIMIT_TIME_CPU: 720 + LIMIT_TIME_REAL: 1440 + ADMIN_PASSWORD: somethingToChange + LIST_DB: "False" + POSTGRES_USER: odoo + POSTGRES_PASSWORD: somethingToChange + + odoodevpy3o10: + extends: odoopy3o10 + build: + context: ./odoo + dockerfile: Dockerfile.py3o.10.dev + image: registry.yaltik.net/odoodev:yaltikpy3o10 + environment: + DEV: 1 + ADMIN_PASSWORD: dev + LIST_DB: "True" + DB_MAXCONN: 20 + WORKERS: 2 + LIMIT_TIME_CPU: 3000 + LIMIT_TIME_REAL: 6000 + LIMIT_MEMORY_SOFT: 7000000000 + LIMIT_MEMORY_HARD: 16000000000