diff --git a/17.0.Dockerfile b/17.0.Dockerfile index 6fe75b438f3a44ea813396904bb2461f854c0b54..774187c648647d5407170d88d9a385b690baa14b 100644 --- a/17.0.Dockerfile +++ b/17.0.Dockerfile @@ -25,16 +25,11 @@ RUN set -x; \ git \ gnupg \ openssh-client \ + postgresql-client \ + wkhtmltopdf \ xmlsec1 &&\ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-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/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb &&\ - echo 'cecbf5a6abbd68d324a7cd6c51ec843d71e98951 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 -y autoremove &&\ - rm -rf /var/lib/apt/lists/* wkhtmltox.deb + rm -rf /var/lib/apt/lists/* COPY --from=builder /svc /svc RUN pip3 install --no-index --find-links=/svc/wheels -r https://raw.githubusercontent.com/oca/OCB/17.0/requirements.txt &&\