diff --git a/odoo/odoo/Dockerfile.8.centos7 b/odoo/odoo/Dockerfile.8.centos7 index c0b64db..ccbf0a1 100644 --- a/odoo/odoo/Dockerfile.8.centos7 +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -15,15 +15,10 @@ RUN yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/ 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 libpqxx # PostgreSQL 9.5 needs SCL now RUN yum install -y centos-release-scl RUN yum-config-manager --enable rhel-server-rhscl-7-rpms RUN yum install -y rh-postgresql95-postgresql -RUN ln -s /opt/rh/rh-postgresql95/root/usr/bin/pg_dump /usr/local/bin/ - # Fonts RUN yum -y install liberation-fonts @@ -41,7 +36,7 @@ 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 ./launch8c7.sh ./launch.sh COPY ./genconf.sh ./ # Post-install tasks diff --git a/odoo/odoo/launch8c7.sh b/odoo/odoo/launch8c7.sh new file mode 100644 index 0000000..b769b96 --- /dev/null +++ b/odoo/odoo/launch8c7.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Needed on C7 for PG95 and pg tools +source /opt/rh/rh-postgresql95/enable + +CONF=/opt/odoo/odoo.conf +ODOOCMD="python /opt/odoo/OCB/odoo.py --config $CONF" + +# Configuration generation and Odoo launch +bash genconf.sh && $ODOOCMD