From 93743c4394025ba153d22db0dded8d6a97852691 Mon Sep 17 00:00:00 2001 From: Dwi Wijonarko Date: Wed, 26 Aug 2020 11:40:45 +0700 Subject: [PATCH] update wkhtmltopdf version --- php-fpm/Dockerfile | 9 +++++++-- workspace/Dockerfile | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 07443f20..6d56c01e 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -872,9 +872,14 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ libx11-dev \ libjpeg62 \ libxtst6 \ + fontconfig \ + libjpeg62-turbo \ + xfonts-base \ + xfonts-75dpi \ wget \ - && wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \ - && chmod +x /usr/local/bin/wkhtmltopdf \ + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_amd64.deb \ + && dpkg -i wkhtmltox_0.12.6-1.stretch_amd64.deb \ + && apt -f install \ ;fi ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 30026fa4..a3154f65 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1318,9 +1318,14 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ libx11-dev \ libjpeg62 \ libxtst6 \ + fontconfig \ + libjpeg-turbo8-dev \ + xfonts-base \ + xfonts-75dpi \ wget \ - && wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \ - && chmod +x /usr/local/bin/wkhtmltopdf \ + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb \ + && dpkg -i wkhtmltox_0.12.6-1.bionic_amd64.deb \ + && apt -f install \ ;fi ###########################################################################