From 9e4d32f8b5b7c6677bef123c02d122ba914b8307 Mon Sep 17 00:00:00 2001 From: Sander Kwantes Date: Mon, 22 Nov 2021 23:58:27 +0100 Subject: [PATCH] use wkhtmltopdf from os supplied base apt source --- 13.0/Dockerfile | 5 +---- 14.0/Dockerfile | 5 +---- 15.0/Dockerfile | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f6e2345..9a575aa 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -30,10 +30,7 @@ RUN apt-get update \ python3-xlrd \ python3-xlwt \ xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + wkhtmltopdf # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ diff --git a/14.0/Dockerfile b/14.0/Dockerfile index 2a21d40..e679be3 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -31,10 +31,7 @@ RUN apt-get update && \ python3-xlrd \ python3-xlwt \ xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + wkhtmltopdf # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 2ab1010..89b4f20 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -31,10 +31,7 @@ RUN apt-get update && \ python3-xlrd \ python3-xlwt \ xz-utils \ - && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ - && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + wkhtmltopdf # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \