Skip to content

Commit 93743c4

Browse files
committed
update wkhtmltopdf version
1 parent ddad361 commit 93743c4

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

php-fpm/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,9 +872,14 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
872872
libx11-dev \
873873
libjpeg62 \
874874
libxtst6 \
875+
fontconfig \
876+
libjpeg62-turbo \
877+
xfonts-base \
878+
xfonts-75dpi \
875879
wget \
876-
&& wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \
877-
&& chmod +x /usr/local/bin/wkhtmltopdf \
880+
&& wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_amd64.deb \
881+
&& dpkg -i wkhtmltox_0.12.6-1.stretch_amd64.deb \
882+
&& apt -f install \
878883
;fi
879884

880885
###########################################################################

workspace/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,9 +1318,14 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
13181318
libx11-dev \
13191319
libjpeg62 \
13201320
libxtst6 \
1321+
fontconfig \
1322+
libjpeg-turbo8-dev \
1323+
xfonts-base \
1324+
xfonts-75dpi \
13211325
wget \
1322-
&& wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \
1323-
&& chmod +x /usr/local/bin/wkhtmltopdf \
1326+
&& wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb \
1327+
&& dpkg -i wkhtmltox_0.12.6-1.bionic_amd64.deb \
1328+
&& apt -f install \
13241329
;fi
13251330

13261331
###########################################################################

0 commit comments

Comments
 (0)