diff --git a/odoo/odoo/Dockerfile.10.centos7 b/odoo/odoo/Dockerfile.10.centos7 index b460879..840abc6 100644 --- a/odoo/odoo/Dockerfile.10.centos7 +++ b/odoo/odoo/Dockerfile.10.centos7 @@ -3,18 +3,18 @@ LABEL maintainer="Yaltik - Fabien Bourgeois " # Odoo dependencies from OL repository and from EPEL, WKHTML # Then PG96 and fonts +COPY pkgs/odoo10c7/*.tgz ./ 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 && \ yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ yum --enablerepo=epel -y install nodejs npm python-pip && \ yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm && \ - curl -LO https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/libpqxx-5.0.1-2.rhel7.x86_64.rpm && \ - curl -LO https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/postgresql96-9.6.24-1PGDG.rhel7.x86_64.rpm && \ - curl -LO https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/postgresql96-libs-9.6.24-1PGDG.rhel7.x86_64.rpm && \ - yum install -y ./*.rpm && \ + tar -zxf ./libpqxx-5.0.1-2.rhel7.x86_64.tgz && \ + tar -zxf ./postgresql96-9.6.24-1PGDG.rhel7.x86_64.tgz && \ + tar -zxf ./postgresql96-libs-9.6.24-1PGDG.rhel7.x86_64.tgz && \ yum -y install postgresql96 libpqxx && \ yum -y install liberation-fonts && \ - rm *.rpm && yum clean all + yum clean all # Install NPM dependencies and Python ones diff --git a/odoo/odoo/Dockerfile.8.centos7 b/odoo/odoo/Dockerfile.8.centos7 index 81bdd7d..73a85fd 100644 --- a/odoo/odoo/Dockerfile.8.centos7 +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -7,14 +7,12 @@ LABEL maintainer="Yaltik - Fabien Bourgeois " # Install NPM dependencies # PostgreSQL 9.5 # Fonts +COPY pkgs/odoo8c7/*.rpm ./ 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 && \ yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ yum --enablerepo=epel -y install nodejs npm python-pip && \ yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm && \ npm install -g less@2 less-plugin-clean-css@1.5.1 && \ - curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/libpqxx-5.0.1-2.rhel7.x86_64.rpm && \ - curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/postgresql95-9.5.25-1PGDG.rhel7.x86_64.rpm && \ - curl -LO https://download.postgresql.org/pub/repos/yum/9.5/redhat/rhel-7-x86_64/postgresql95-libs-9.5.25-1PGDG.rhel7.x86_64.rpm && \ yum install -y ./*.rpm && \ yum -y install liberation-fonts && yum clean all diff --git a/odoo/odoo/pkgs/odoo10c7/libpqxx-5.0.1-2.rhel7.x86_64.tgz b/odoo/odoo/pkgs/odoo10c7/libpqxx-5.0.1-2.rhel7.x86_64.tgz new file mode 100644 index 0000000..8d0b501 Binary files /dev/null and b/odoo/odoo/pkgs/odoo10c7/libpqxx-5.0.1-2.rhel7.x86_64.tgz differ diff --git a/odoo/odoo/pkgs/odoo10c7/postgresql96-9.6.24-1PGDG.rhel7.x86_64.tgz b/odoo/odoo/pkgs/odoo10c7/postgresql96-9.6.24-1PGDG.rhel7.x86_64.tgz new file mode 100644 index 0000000..5c32d90 Binary files /dev/null and b/odoo/odoo/pkgs/odoo10c7/postgresql96-9.6.24-1PGDG.rhel7.x86_64.tgz differ diff --git a/odoo/odoo/pkgs/odoo10c7/postgresql96-libs-9.6.24-1PGDG.rhel7.x86_64.tgz b/odoo/odoo/pkgs/odoo10c7/postgresql96-libs-9.6.24-1PGDG.rhel7.x86_64.tgz new file mode 100644 index 0000000..fc69efe Binary files /dev/null and b/odoo/odoo/pkgs/odoo10c7/postgresql96-libs-9.6.24-1PGDG.rhel7.x86_64.tgz differ diff --git a/odoo/odoo/pkgs/odoo8c7/libpqxx-5.0.1-2.rhel7.x86_64.rpm b/odoo/odoo/pkgs/odoo8c7/libpqxx-5.0.1-2.rhel7.x86_64.rpm new file mode 100644 index 0000000..269ca6c Binary files /dev/null and b/odoo/odoo/pkgs/odoo8c7/libpqxx-5.0.1-2.rhel7.x86_64.rpm differ diff --git a/odoo/odoo/pkgs/odoo8c7/postgresql95-9.5.25-1PGDG.rhel7.x86_64.rpm b/odoo/odoo/pkgs/odoo8c7/postgresql95-9.5.25-1PGDG.rhel7.x86_64.rpm new file mode 100644 index 0000000..05f2f1c Binary files /dev/null and b/odoo/odoo/pkgs/odoo8c7/postgresql95-9.5.25-1PGDG.rhel7.x86_64.rpm differ diff --git a/odoo/odoo/pkgs/odoo8c7/postgresql95-libs-9.5.25-1PGDG.rhel7.x86_64.rpm b/odoo/odoo/pkgs/odoo8c7/postgresql95-libs-9.5.25-1PGDG.rhel7.x86_64.rpm new file mode 100644 index 0000000..d41ef28 Binary files /dev/null and b/odoo/odoo/pkgs/odoo8c7/postgresql95-libs-9.5.25-1PGDG.rhel7.x86_64.rpm differ