ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2689 from dwijonarko/master 

update  wkhtmltopdf version
This commit is contained in:
Shao Yu-Lung (Allen) 2020-09-04 09:23:28 +08:00 committed by GitHub
parent 9f6d7f470c 93743c4394
commit 1c5ee264ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
php-fpm/Dockerfile
View File

@ -872,9 +872,14 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
libx11-dev \ libx11-dev \
libjpeg62 \ libjpeg62 \
libxtst6 \ libxtst6 \
fontconfig \
libjpeg62-turbo \
xfonts-base \
xfonts-75dpi \
wget \ wget \
&& wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \ && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_amd64.deb \
&& chmod +x /usr/local/bin/wkhtmltopdf \ && dpkg -i wkhtmltox_0.12.6-1.stretch_amd64.deb \
&& apt -f install \
;fi ;fi
########################################################################### ###########################################################################

9
workspace/Dockerfile
View File

@ -1318,9 +1318,14 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
libx11-dev \ libx11-dev \
libjpeg62 \ libjpeg62 \
libxtst6 \ libxtst6 \
fontconfig \
libjpeg-turbo8-dev \
xfonts-base \
xfonts-75dpi \
wget \ wget \
&& wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \ && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb \
&& chmod +x /usr/local/bin/wkhtmltopdf \ && dpkg -i wkhtmltox_0.12.6-1.bionic_amd64.deb \
&& apt -f install \
;fi ;fi
########################################################################### ###########################################################################