diff --git a/odoo/odoo/Dockerfile.10.centos7 b/odoo/odoo/Dockerfile.10.centos7 index 654ed4d..2b73b15 100644 --- a/odoo/odoo/Dockerfile.10.centos7 +++ b/odoo/odoo/Dockerfile.10.centos7 @@ -1,8 +1,9 @@ -FROM centos:7 +FROM oraclelinux: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 mailcap +# Odoo dependencies from OL repository +RUN yum -y groupinstall "Development Tools" +RUN 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 mailcap # EPEL for NodeJS RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm diff --git a/odoo/odoo/Dockerfile.py3o.10.centos7 b/odoo/odoo/Dockerfile.py3o.10.centos7 index 71db0c1..9168043 100644 --- a/odoo/odoo/Dockerfile.py3o.10.centos7 +++ b/odoo/odoo/Dockerfile.py3o.10.centos7 @@ -3,7 +3,10 @@ MAINTAINER Yaltik - Fabien Bourgeois # Install local LibreOffice for better conversion and supported types USER root -RUN yum -y install libreoffice +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" +RUN yum -y install "./LibreOffice_"$LO_VERSION"_Linux_x86-64_rpm/RPMS/"* +RUN rm -rf "./LibreOffice_"$LO_VERSION"_Linux_x86-64_rpm"* # Addons dependencies USER odoo