Skip to content
Extraits de code Groupes Projets
Valider a2543e7c rédigé par remi-filament's avatar remi-filament
Parcourir les fichiers

Move postgresql-client packages later in file

parent b23e4c62
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Chargement en cours
...@@ -9,8 +9,6 @@ ENV APT_DEPS='python-dev build-essential libxml2-dev libxslt1-dev libjpeg-dev li ...@@ -9,8 +9,6 @@ ENV APT_DEPS='python-dev build-essential libxml2-dev libxslt1-dev libjpeg-dev li
PGDATABASE=odoo PGDATABASE=odoo
RUN set -x; \ 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 update &&\
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
...@@ -26,7 +24,6 @@ RUN set -x; \ ...@@ -26,7 +24,6 @@ RUN set -x; \
libxrender1 \ libxrender1 \
libxslt1.1 \ libxslt1.1 \
node-less \ node-less \
postgresql-client \
python-gevent \ python-gevent \
python-ldap \ python-ldap \
python-qrcode \ python-qrcode \
...@@ -38,9 +35,13 @@ RUN set -x; \ ...@@ -38,9 +35,13 @@ RUN set -x; \
xfonts-75dpi \ xfonts-75dpi \
xfonts-base \ 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 &&\ 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 - &&\ 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 ./wkhtmltox.deb &&\
apt-get install -y --no-install-recommends postgresql-client &&\
apt-get install -y --no-install-recommends ${APT_DEPS} &&\ apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python /dev/stdin &&\ 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 &&\ pip install -I -r https://raw.githubusercontent.com/OCA/OCB/10.0/requirements.txt &&\
......
...@@ -7,8 +7,6 @@ ENV APT_DEPS='build-essential libldap2-dev libsasl2-dev python3-dev python3-whee ...@@ -7,8 +7,6 @@ ENV APT_DEPS='build-essential libldap2-dev libsasl2-dev python3-dev python3-whee
PGDATABASE=odoo PGDATABASE=odoo
RUN set -x; \ 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 update &&\
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
...@@ -21,7 +19,6 @@ RUN set -x; \ ...@@ -21,7 +19,6 @@ RUN set -x; \
libxext6 \ libxext6 \
libxrender1 \ libxrender1 \
node-less \ node-less \
postgresql-client \
python3-pip \ python3-pip \
python3-pyldap \ python3-pyldap \
python3-qrcode \ python3-qrcode \
...@@ -33,9 +30,13 @@ RUN set -x; \ ...@@ -33,9 +30,13 @@ RUN set -x; \
xfonts-base \ xfonts-base \
xz-utils \ 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 &&\ 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 - &&\ 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 ./wkhtmltox.deb &&\
apt-get install -y --no-install-recommends postgresql-client &&\
apt-get install -y --no-install-recommends ${APT_DEPS} &&\ apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python3 /dev/stdin &&\ 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 &&\ pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt &&\
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter