From f126d72f664e1844ce35bf46b7b43a46d56e3fd5 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 10 Oct 2019 16:52:15 +0200 Subject: [PATCH] [FIX] 11.0-13.0: use apt-get to install wkhtmltopdf Usage of apt-get should prevent installing wkhtmltopdf on wrong architecture. --- 11.0/Dockerfile | 3 +-- 12.0/Dockerfile | 3 +-- 13.0/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 706c9969e..f8f56c8ad 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -31,8 +31,7 @@ RUN set -x; \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb\ - && apt-get -y install -f --no-install-recommends \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 60f7736d4..8103ab620 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -31,8 +31,7 @@ RUN set -x; \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb\ - && apt-get -y install -f --no-install-recommends \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 03475900d..44d25bd52 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -29,8 +29,7 @@ RUN set -x; \ xz-utils \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ - && dpkg --force-depends -i wkhtmltox.deb\ - && apt-get -y install -f --no-install-recommends \ + && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # install latest postgresql-client