From a2543e7c077418c3aa28b89bfb1df5a289c0e782 Mon Sep 17 00:00:00 2001
From: remi-filament <30716308+remi-filament@users.noreply.github.com>
Date: Wed, 23 Jan 2019 10:56:50 +0100
Subject: [PATCH] Move postgresql-client packages later in file
---
10.0.Dockerfile | 7 ++++---
12.0.Dockerfile | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/10.0.Dockerfile b/10.0.Dockerfile
index de21ecb..80211aa 100644
--- a/10.0.Dockerfile
+++ b/10.0.Dockerfile
@@ -9,8 +9,6 @@ ENV APT_DEPS='python-dev build-essential libxml2-dev libxslt1-dev libjpeg-dev li
PGDATABASE=odoo
RUN set -x; \
- echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' >> /etc/apt/sources.list.d/postgresql.list &&\
- curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
apt-get update &&\
apt-get install -y --no-install-recommends \
ca-certificates \
@@ -26,7 +24,6 @@ RUN set -x; \
libxrender1 \
libxslt1.1 \
node-less \
- postgresql-client \
python-gevent \
python-ldap \
python-qrcode \
@@ -38,9 +35,13 @@ RUN set -x; \
xfonts-75dpi \
xfonts-base \
&& \
+ echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' >> /etc/apt/sources.list.d/postgresql.list &&\
+ curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb &&\
echo '4d104ff338dc2d2083457b3b1e9baab8ddf14202 wkhtmltox.deb' | sha1sum -c - &&\
+ apt-get update &&\
apt-get install -y --no-install-recommends ./wkhtmltox.deb &&\
+ apt-get install -y --no-install-recommends postgresql-client &&\
apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python /dev/stdin &&\
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/10.0/requirements.txt &&\
diff --git a/12.0.Dockerfile b/12.0.Dockerfile
index 8a225b5..ab44cfd 100644
--- a/12.0.Dockerfile
+++ b/12.0.Dockerfile
@@ -7,8 +7,6 @@ ENV APT_DEPS='build-essential libldap2-dev libsasl2-dev python3-dev python3-whee
PGDATABASE=odoo
RUN set -x; \
- echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >> /etc/apt/sources.list.d/postgresql.list &&\
- curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
apt-get update &&\
apt-get install -y --no-install-recommends \
ca-certificates \
@@ -21,7 +19,6 @@ RUN set -x; \
libxext6 \
libxrender1 \
node-less \
- postgresql-client \
python3-pip \
python3-pyldap \
python3-qrcode \
@@ -33,9 +30,13 @@ RUN set -x; \
xfonts-base \
xz-utils \
&&\
+ echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >> /etc/apt/sources.list.d/postgresql.list &&\
+ curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb &&\
echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - &&\
+ apt-get update &&\
apt-get install -y --no-install-recommends ./wkhtmltox.deb &&\
+ apt-get install -y --no-install-recommends postgresql-client &&\
apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python3 /dev/stdin &&\
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt &&\
--
GitLab