diff --git a/odoo/base.yml b/odoo/base.yml index e3d6a51..af94527 100644 --- a/odoo/base.yml +++ b/odoo/base.yml @@ -37,6 +37,13 @@ services: dockerfile: Dockerfile.10.centos7 image: registry.yaltik.net/odoo:yaltikbase10c7 + odoobase10c8: + init: true + build: + context: ./odoo + dockerfile: Dockerfile.10.centos8 + image: registry.yaltik.net/odoo:yaltikbase10c8 + odoo10c7: init: true build: @@ -44,6 +51,13 @@ services: dockerfile: Dockerfile.ext.10.centos7 image: registry.yaltik.net/odoo:yaltik10c7 + odoo10c8: + init: true + build: + context: ./odoo + dockerfile: Dockerfile.ext.10.centos8 + image: registry.yaltik.net/odoo:yaltik10c8 + # odoo11: # init: true # build: diff --git a/odoo/dev.yml b/odoo/dev.yml index dce6963..75cfd45 100644 --- a/odoo/dev.yml +++ b/odoo/dev.yml @@ -31,6 +31,12 @@ services: dockerfile: Dockerfile.10.centos7.dev image: registry.yaltik.net/odoodev:yaltik10c7 + odoodev10c8: + build: + context: ./odoo + dockerfile: Dockerfile.10.centos8.dev + image: registry.yaltik.net/odoodev:yaltik10c8 + # odoodev12: # build: # context: ./odoo diff --git a/odoo/odoo/Dockerfile.10.centos8 b/odoo/odoo/Dockerfile.10.centos8 new file mode 100644 index 0000000..c349aa6 --- /dev/null +++ b/odoo/odoo/Dockerfile.10.centos8 @@ -0,0 +1,47 @@ +FROM oraclelinux:8 +LABEL maintainer="Yaltik - Fabien Bourgeois " + +# Odoo dependencies from OL repository and from EPEL, WKHTML +# Then PG96 and fonts +# COPY pkgs/odoo10c7/*.tgz ./ +COPY postgres96-ol8.repo /etc/yum.repos.d/postgres96.repo +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 xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg2 freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel mailcap liberation-fonts nodejs npm python2-pip python2-devel && \ + yum --enablerepo=pgdg96-archive -y install libpqxx postgresql96-libs && \ + yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos8.x86_64.rpm && \ + yum clean all && \ + /usr/sbin/update-alternatives --set python /usr/bin/python2 && \ + ln -s /usr/bin/pip2 /usr/local/bin/pip + +# Install NPM dependencies and Python ones +RUN npm install -g less@2 less-plugin-clean-css@1.5.1 && \ + pip install --no-cache-dir -U pip==20.3.4 setuptools==44.1.1 + +# 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 && \ + git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git && \ + pip install --user --no-cache-dir -r OCB/requirements.txt + +WORKDIR /opt/odoo + +# Launch scripts +COPY ./launch10.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", "launch10.sh" ] diff --git a/odoo/odoo/Dockerfile.10.centos8.dev b/odoo/odoo/Dockerfile.10.centos8.dev new file mode 100644 index 0000000..82a8311 --- /dev/null +++ b/odoo/odoo/Dockerfile.10.centos8.dev @@ -0,0 +1,16 @@ +FROM registry.yaltik.net/odoo:yaltik10c8 +LABEL 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 --no-cache-dir watchdog==0.10.7 ipython==5.10.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell10.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/ +COPY launch10.dev.sh /opt/odoo/launch10.sh +ENV DEV 1 diff --git a/odoo/odoo/Dockerfile.ext.10.centos8 b/odoo/odoo/Dockerfile.ext.10.centos8 new file mode 100644 index 0000000..da1778b --- /dev/null +++ b/odoo/odoo/Dockerfile.ext.10.centos8 @@ -0,0 +1,23 @@ +FROM registry.yaltik.net/odoo:yaltikbase10c8 +LABEL maintainer="Yaltik - Fabien Bourgeois " + +# Extra dependencies +RUN pip install --user --no-cache-dir unidecode==1.2.0 requests-oauthlib==1.3.1 && \ + pip install --user git+https://github.com/OCA/openupgradelib.git@3.3.2 + +# External code +WORKDIR /opt/odoo/extra-addons +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/reporting-engine && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/crm && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/queue && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools && \ + git clone --depth 1 -b 10.0 https://github.com/OCA/web && \ + git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme + +# Scripts +COPY i18n-import.sh upd.sh /opt/odoo/ + +WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.py3o.10.centos8 b/odoo/odoo/Dockerfile.py3o.10.centos8 new file mode 100644 index 0000000..89c0cda --- /dev/null +++ b/odoo/odoo/Dockerfile.py3o.10.centos8 @@ -0,0 +1,23 @@ +FROM registry.yaltik.net/odoo:yaltik10c8 +LABEL maintainer="Yaltik - Fabien Bourgeois " + +# Install local LibreOffice for better conversion and supported types +# And for conversions +USER root +ENV LO_VERSION 5.3.7.2 +RUN curl -LO "https://downloadarchive.documentfoundation.org/libreoffice/old/${LO_VERSION}/rpm/x86_64/LibreOffice_${LO_VERSION}_Linux_x86-64_rpm.tar.gz" && \ + tar zxf "LibreOffice_${LO_VERSION}_Linux_x86-64_rpm.tar.gz" && \ + yum -y install "./LibreOffice_${LO_VERSION}_Linux_x86-64_rpm/RPMS/"* && \ + rm -rf "./LibreOffice_${LO_VERSION}_Linux_x86-64_rpm"* && \ + yum install -y cairo cups-libs libSM mesa-libGL && \ + yum clean all && \ + ln -s /usr/bin/libreoffice5.3 /usr/local/bin/libreoffice + +# Addons dependencies +USER odoo +RUN pip install --no-cache-dir --user py3o.template==0.10.0 py3o.formats==0.3 + +# Scripts +COPY i18n-import.sh upd.sh /opt/odoo/ + +WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.py3o.10.centos8.dev b/odoo/odoo/Dockerfile.py3o.10.centos8.dev new file mode 100644 index 0000000..224b639 --- /dev/null +++ b/odoo/odoo/Dockerfile.py3o.10.centos8.dev @@ -0,0 +1,16 @@ +FROM registry.yaltik.net/odoo:yaltikpy3o10c8 +LABEL 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 --no-cache-dir watchdog==0.10.7 ipython==5.10.0 && \ + mkdir -p /opt/odoo/.ipython/profile_default +COPY ipython_config.py /opt/odoo/.ipython/profile_default/ +COPY shell_helpers.py /opt/odoo/ +COPY shell10.sh /opt/odoo/shell.sh +COPY i18n.sh /opt/odoo/ +COPY launch10.dev.sh /opt/odoo/launch10.sh +ENV DEV 1 diff --git a/odoo/odoo/postgres96-ol8.repo b/odoo/odoo/postgres96-ol8.repo new file mode 100644 index 0000000..ba1a7b6 --- /dev/null +++ b/odoo/odoo/postgres96-ol8.repo @@ -0,0 +1,6 @@ +[pgdg96-archive] +name=PostgreSQL 9.6 RPMs for RHEL/CentOS 8 +baseurl=https://yum-archive.postgresql.org/9.6/redhat/rhel-8-x86_64 +enabled=1 +gpgcheck=1 +gpgkey=https://yum.postgresql.org/keys/RPM-GPG-KEY-PGDG diff --git a/odoo/py3o.yml b/odoo/py3o.yml index 4879709..66902b5 100644 --- a/odoo/py3o.yml +++ b/odoo/py3o.yml @@ -7,8 +7,20 @@ services: dockerfile: Dockerfile.py3o.10.centos7 image: registry.yaltik.net/odoo:yaltikpy3o10c7 + odoopy3o10c8: + build: + context: ./odoo + dockerfile: Dockerfile.py3o.10.centos8 + image: registry.yaltik.net/odoo:yaltikpy3o10c8 + odoodevpy3o10c7: build: context: ./odoo dockerfile: Dockerfile.py3o.10.centos7.dev image: registry.yaltik.net/odoodev:yaltikpy3o10c7 + + odoodevpy3o10c8: + build: + context: ./odoo + dockerfile: Dockerfile.py3o.10.centos8.dev + image: registry.yaltik.net/odoodev:yaltikpy3o10c8