[FIX]Odoo 10 with PG96 needs PG96 client tools

This commit is contained in:
Fabien Bourgeois 2016-10-14 18:42:44 +02:00
parent c7c0c7c2b8
commit 7c9650bac0

View File

@ -14,12 +14,12 @@ RUN ln -s /usr/bin/nodejs /usr/bin/node
# Install NPM dependencies # Install NPM dependencies
RUN npm install -g less less-plugin-clean-css RUN npm install -g less less-plugin-clean-css
# PostgreSQL 9.5 # PostgreSQL 9.6
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main 9.5" \ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main 9.6" \
> /etc/apt/sources.list.d/postgresql.list \ > /etc/apt/sources.list.d/postgresql.list \
&& curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get update \ && apt-get update \
&& apt-get install -y libpq-dev postgresql-client-9.5 && apt-get install -y libpq-dev postgresql-client-9.6
# WKHTMLTOPDF and fonts # WKHTMLTOPDF and fonts
ENV WKNAME wkhtmltox-0.12.1.2_linux-jessie-amd64.deb ENV WKNAME wkhtmltox-0.12.1.2_linux-jessie-amd64.deb