From 4438eb1265dd0b32dcaff3316706acd71756095a Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Tue, 5 May 2020 20:04:50 +0200 Subject: [PATCH] [ADD]Odoo 8 and 10 base, dev, py3o images from CentOS7 --- odoo/base.yml | 46 ++++++++++++++++++++ odoo/dev.yml | 38 ++++++++++++++++ odoo/golem/Dockerfile.master.dev | 3 +- odoo/golem/Dockerfile.v3.dev | 3 +- odoo/odoo/Dockerfile.10.centos7 | 55 ++++++++++++++++++++++++ odoo/odoo/Dockerfile.10.centos7.dev | 13 ++++++ odoo/odoo/Dockerfile.10.dev | 3 +- odoo/odoo/Dockerfile.8.centos7 | 51 ++++++++++++++++++++++ odoo/odoo/Dockerfile.8.centos7.dev | 9 ++++ odoo/odoo/Dockerfile.ext.10.centos7 | 22 ++++++++++ odoo/odoo/Dockerfile.py3o.10.centos7 | 13 ++++++ odoo/odoo/Dockerfile.py3o.10.centos7.dev | 13 ++++++ odoo/odoo/Dockerfile.py3o.10.dev | 3 +- odoo/py3o.yml | 36 ++++++++++++++++ 14 files changed, 300 insertions(+), 8 deletions(-) create mode 100644 odoo/odoo/Dockerfile.10.centos7 create mode 100644 odoo/odoo/Dockerfile.10.centos7.dev create mode 100644 odoo/odoo/Dockerfile.8.centos7 create mode 100644 odoo/odoo/Dockerfile.8.centos7.dev create mode 100644 odoo/odoo/Dockerfile.ext.10.centos7 create mode 100644 odoo/odoo/Dockerfile.py3o.10.centos7 create mode 100644 odoo/odoo/Dockerfile.py3o.10.centos7.dev diff --git a/odoo/base.yml b/odoo/base.yml index 74bf8cd..b74822c 100644 --- a/odoo/base.yml +++ b/odoo/base.yml @@ -21,6 +21,24 @@ services: POSTGRES_PASSWORD: somethingToChange PGDATA: /opt/odoo/pgdata + odoo8c7: + init: true + build: + context: ./odoo + dockerfile: Dockerfile.8.centos7 + image: registry.yaltik.net/odoo:yaltik8c7 + 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 + odoo: init: true build: ./odoo @@ -109,6 +127,34 @@ services: dockerfile: Dockerfile.ext.10 image: registry.yaltik.net/odoo:yaltik10 + odoobase10c7: + init: true + build: + context: ./odoo + dockerfile: Dockerfile.10.centos7 + image: registry.yaltik.net/odoo:yaltikbase10c7 + 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 + + odoo10c7: + init: true + extends: + file: base.yml + service: odoobase10c7 + build: + context: ./odoo + dockerfile: Dockerfile.ext.10.centos7 + image: registry.yaltik.net/odoo:yaltik10c7 + odoo11: init: true build: diff --git a/odoo/dev.yml b/odoo/dev.yml index b910ed9..dc658dc 100644 --- a/odoo/dev.yml +++ b/odoo/dev.yml @@ -33,6 +33,24 @@ services: DEV: 1 PROXY_MODE: "False" + odoo8c7dev: + extends: + file: base.yml + service: odoo8c7 + build: + context: ./odoo + dockerfile: Dockerfile.8.centos7.dev + image: registry.yaltik.net/odoodev:yaltik8c7 + environment: + ADMIN_PASSWORD: dev + LIST_DB: "True" + DB_MAXCONN: 20 + WORKERS: 2 + LIMIT_TIME_CPU: 3000 + LIMIT_TIME_REAL: 6000 + DEV: 1 + PROXY_MODE: "False" + odoodev10: extends: file: base.yml @@ -53,6 +71,26 @@ services: LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_HARD: 16000000000 + odoodev10c7: + extends: + file: base.yml + service: odoo10c7 + build: + context: ./odoo + dockerfile: Dockerfile.10.centos7.dev + image: registry.yaltik.net/odoodev:yaltik10c7 + environment: + DEV: 1 + CODE_FOLDER: code + 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 + odoodev12: extends: file: base.yml diff --git a/odoo/golem/Dockerfile.master.dev b/odoo/golem/Dockerfile.master.dev index 13348d7..c874a83 100644 --- a/odoo/golem/Dockerfile.master.dev +++ b/odoo/golem/Dockerfile.master.dev @@ -3,8 +3,7 @@ MAINTAINER Yaltik - Fabien Bourgeois # PostgreSQL CLI # Mandatory for pyhton2 -RUN pip install --user -I humanize==0.5.1 -RUN pip install --user pgcli +RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 COPY pgcli.sh ./ # Odoo specific RUN pip install --user watchdog diff --git a/odoo/golem/Dockerfile.v3.dev b/odoo/golem/Dockerfile.v3.dev index a5d5851..abb979b 100644 --- a/odoo/golem/Dockerfile.v3.dev +++ b/odoo/golem/Dockerfile.v3.dev @@ -3,8 +3,7 @@ MAINTAINER Yaltik - Fabien Bourgeois # PostgreSQL CLI # Mandatory for pyhton2 -RUN pip install --user -I humanize==0.5.1 -RUN pip install --user pgcli +RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 COPY pgcli.sh ./ # Odoo specific RUN pip install --user watchdog diff --git a/odoo/odoo/Dockerfile.10.centos7 b/odoo/odoo/Dockerfile.10.centos7 new file mode 100644 index 0000000..553a197 --- /dev/null +++ b/odoo/odoo/Dockerfile.10.centos7 @@ -0,0 +1,55 @@ +FROM centos:7 +MAINTAINER Yaltik - Fabien Bourgeois + +# Odoo dependencies from Debian APT repository +RUN yum -y groupinstall "Development Tools" && yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel + +# EPEL for NodeJS +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +# Packages from EPEL +RUN yum --enablerepo=epel -y install nodejs npm python-pip +# WKHTMLTOPDF +RUN yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm + +# Install NPM dependencies +RUN npm install -g less@2 less-plugin-clean-css + +# PostgreSQL 9.6 +# From SCLO ? +RUN yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm +RUN yum -y install postgresql96 libpqxx + + +# Fonts +RUN yum -y install liberation-fonts + +# Upgrade pip +RUN pip install -U pip +RUN pip install -U setuptools + +# Create odoo user +RUN useradd odoo -md /opt/odoo + +# Install OCB 10.0 latest +ENV ODOO_BRANCH 10.0 +WORKDIR /opt/odoo +# Default user : odoo +USER odoo +RUN mkdir pipcache data backups extra-addons custom-addons +RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git +RUN pip install --user -r OCB/requirements.txt + +# Launch scripts +COPY ./launch.sh ./ +COPY ./genconf.sh ./ + +# Post-install tasks +RUN touch odoo.conf + +# Odoo default ports +EXPOSE 8069 8072 + +# Volumes : data dir for filestore and addons +VOLUME /opt/odoo/data + +CMD [ "bash", "launch.sh" ] diff --git a/odoo/odoo/Dockerfile.10.centos7.dev b/odoo/odoo/Dockerfile.10.centos7.dev new file mode 100644 index 0000000..7bd5761 --- /dev/null +++ b/odoo/odoo/Dockerfile.10.centos7.dev @@ -0,0 +1,13 @@ +FROM registry.yaltik.net/odoo:yaltik10c7 +MAINTAINER Yaltik - Fabien Bourgeois + +# PostgreSQL CLI +# Mandatory for pyhton2 +RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 +COPY pgcli.sh ./ +# Odoo specific +RUN pip install --user watchdog +COPY shell10.sh ./ +COPY i18n.sh ./ +COPY launch10.dev.sh ./launch10.sh +ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.10.dev b/odoo/odoo/Dockerfile.10.dev index 09b2a68..e08c428 100644 --- a/odoo/odoo/Dockerfile.10.dev +++ b/odoo/odoo/Dockerfile.10.dev @@ -3,8 +3,7 @@ MAINTAINER Yaltik - Fabien Bourgeois # PostgreSQL CLI # Mandatory for pyhton2 -RUN pip install --user -I humanize==0.5.1 -RUN pip install --user pgcli +RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 COPY pgcli.sh ./ # Odoo specific RUN pip install --user watchdog diff --git a/odoo/odoo/Dockerfile.8.centos7 b/odoo/odoo/Dockerfile.8.centos7 new file mode 100644 index 0000000..08c0fd3 --- /dev/null +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -0,0 +1,51 @@ +FROM centos:7 +MAINTAINER Yaltik - Fabien Bourgeois + +# Odoo dependencies from Debian APT repository +RUN yum -y groupinstall "Development Tools" && yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel + +# EPEL for NodeJS +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +# Packages from EPEL +RUN yum --enablerepo=epel -y install nodejs npm python-pip +# WKHTMLTOPDF +RUN yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm + +# Install NPM dependencies +RUN npm install -g less@2 less-plugin-clean-css + +# PostgreSQL 9.5 +# From SCLO ? +RUN yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm +RUN yum -y install postgresql95 libpqxx + + +# Fonts +RUN yum -y install liberation-fonts + +# Create odoo user +RUN useradd odoo -md /opt/odoo + +# Install OCB 8.0 latest +ENV ODOO_BRANCH 8.0 +WORKDIR /opt/odoo +# Default user : odoo +USER odoo +RUN mkdir pipcache data backups extra-addons custom-addons +RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git +RUN pip install --user -r OCB/requirements.txt + +# Launch scripts +COPY ./launch.sh ./ +COPY ./genconf.sh ./ + +# Post-install tasks +RUN touch odoo.conf + +# Odoo default ports +EXPOSE 8069 8072 + +# Volumes : data dir for filestore and addons +VOLUME /opt/odoo/data + +CMD [ "bash", "launch.sh" ] diff --git a/odoo/odoo/Dockerfile.8.centos7.dev b/odoo/odoo/Dockerfile.8.centos7.dev new file mode 100644 index 0000000..b1e6614 --- /dev/null +++ b/odoo/odoo/Dockerfile.8.centos7.dev @@ -0,0 +1,9 @@ +FROM registry.yaltik.net/odoo:yaltik8c7 +MAINTAINER Yaltik - Fabien Bourgeois + +WORKDIR /opt/odoo/extra-addons +RUN git clone --depth 1 -b 8.0 https://github.com/OCA/server-tools + +WORKDIR /opt/odoo +COPY shell.sh ./ +COPY launch.dev.sh ./launch.sh diff --git a/odoo/odoo/Dockerfile.ext.10.centos7 b/odoo/odoo/Dockerfile.ext.10.centos7 new file mode 100644 index 0000000..a267618 --- /dev/null +++ b/odoo/odoo/Dockerfile.ext.10.centos7 @@ -0,0 +1,22 @@ +FROM registry.yaltik.net/odoo:yaltikbase10c7 +MAINTAINER Yaltik - Fabien Bourgeois + +# Extra dependency +RUN pip install --user unidecode + +# External code +WORKDIR /opt/odoo/extra-addons +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/crm +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/queue +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/web +RUN git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme + +WORKDIR /opt/odoo + +# Addons dependencies +RUN pip install --user openupgradelib diff --git a/odoo/odoo/Dockerfile.py3o.10.centos7 b/odoo/odoo/Dockerfile.py3o.10.centos7 new file mode 100644 index 0000000..bf5938b --- /dev/null +++ b/odoo/odoo/Dockerfile.py3o.10.centos7 @@ -0,0 +1,13 @@ +FROM registry.yaltik.net/odoo:yaltik10c7 +MAINTAINER Yaltik - Fabien Bourgeois + +# Install local LibreOffice for better conversion and supported types +USER root +# Mailcap for mime.types support, required +RUN yum -y install libreoffice mailcap + +# Addons dependencies +USER odoo +RUN pip install --user py3o.template && pip install --user py3o.formats + +WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.py3o.10.centos7.dev b/odoo/odoo/Dockerfile.py3o.10.centos7.dev new file mode 100644 index 0000000..0ea47ba --- /dev/null +++ b/odoo/odoo/Dockerfile.py3o.10.centos7.dev @@ -0,0 +1,13 @@ +FROM registry.yaltik.net/odoo:yaltikpy3o10c7 +MAINTAINER Yaltik - Fabien Bourgeois + +# PostgreSQL CLI +# Mandatory for pyhton2 +RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 +COPY pgcli.sh ./ +# Odoo specific +RUN pip install --user watchdog +COPY shell10.sh ./ +COPY i18n.sh ./ +COPY launch10.dev.sh ./launch10.sh +ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.py3o.10.dev b/odoo/odoo/Dockerfile.py3o.10.dev index 7eb05be..455b4da 100644 --- a/odoo/odoo/Dockerfile.py3o.10.dev +++ b/odoo/odoo/Dockerfile.py3o.10.dev @@ -3,8 +3,7 @@ MAINTAINER Yaltik - Fabien Bourgeois # PostgreSQL CLI # Mandatory for pyhton2 -RUN pip install --user -I humanize==0.5.1 -RUN pip install --user pgcli +RUN pip install --user pgcli==2.2.0 --only-binary psycopg2 COPY pgcli.sh ./ # Odoo specific RUN pip install --user watchdog diff --git a/odoo/py3o.yml b/odoo/py3o.yml index 9a8685e..33b3cb3 100644 --- a/odoo/py3o.yml +++ b/odoo/py3o.yml @@ -36,3 +36,39 @@ services: LIMIT_TIME_REAL: 6000 LIMIT_MEMORY_SOFT: 7000000000 LIMIT_MEMORY_HARD: 16000000000 + + odoopy3o10c7: + init: true + build: + context: ./odoo + dockerfile: Dockerfile.py3o.10.centos7 + image: registry.yaltik.net/odoo:yaltikpy3o10c7 + 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 + + odoodevpy3o10c7: + extends: odoopy3o10c7 + build: + context: ./odoo + dockerfile: Dockerfile.py3o.10.centos7.dev + image: registry.yaltik.net/odoodev:yaltikpy3o10c7 + environment: + DEV: 1 + CODE_FOLDER: code + 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