Skip to content

Commit e3e0d76

Browse files
authored
Merge pull request #102 from devilbox/release-0.78
Use QT-patched version of wkhtmltopdf
2 parents 554e979 + 8b0fdc6 commit e3e0d76

13 files changed

Lines changed: 166 additions & 12 deletions

File tree

Dockerfiles/work/Dockerfile-5.2

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -218,6 +217,18 @@ RUN set -x \
218217
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
219218
&& rm -rf /tmp/y \
220219
\
220+
# wkhtmltopdf
221+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
222+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
223+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
224+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
225+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
226+
&& dpkg -i /tmp/wkhtmltopdf.deb \
227+
&& rm -f /tmp/wkhtmltopdf.deb \
228+
\
229+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
230+
&& rm -rf /var/lib/apt/lists/* \
231+
\
221232
# yamllint
222233
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
223234
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \
@@ -315,6 +326,7 @@ RUN set -x \
315326
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
316327
&& sass --version | grep -E '[.0-9]+' \
317328
&& webpack --version | grep -E '[.0-9]+' \
329+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
318330
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
319331
&& true
320332

Dockerfiles/work/Dockerfile-5.3

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -256,6 +255,18 @@ RUN set -x \
256255
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
257256
&& rm -rf /tmp/y \
258257
\
258+
# wkhtmltopdf
259+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
260+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
261+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
262+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
263+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
264+
&& dpkg -i /tmp/wkhtmltopdf.deb \
265+
&& rm -f /tmp/wkhtmltopdf.deb \
266+
\
267+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
268+
&& rm -rf /var/lib/apt/lists/* \
269+
\
259270
# wpcli
260271
&& curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp \
261272
&& chmod +x /usr/local/bin/wp \
@@ -362,6 +373,7 @@ RUN set -x \
362373
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
363374
&& sass --version | grep -E '[.0-9]+' \
364375
&& webpack --version | grep -E '[.0-9]+' \
376+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
365377
&& wp --allow-root --version | grep -E '[.0-9]+' \
366378
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
367379
&& true

Dockerfiles/work/Dockerfile-5.4

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -285,6 +284,18 @@ RUN set -x \
285284
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
286285
&& rm -rf /tmp/y \
287286
\
287+
# wkhtmltopdf
288+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
289+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
290+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
291+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
292+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
293+
&& dpkg -i /tmp/wkhtmltopdf.deb \
294+
&& rm -f /tmp/wkhtmltopdf.deb \
295+
\
296+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
297+
&& rm -rf /var/lib/apt/lists/* \
298+
\
288299
# wpcli
289300
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
290301
&& chmod +x /usr/local/bin/wp \
@@ -395,6 +406,7 @@ RUN set -x \
395406
&& sass --version | grep -E '[.0-9]+' \
396407
&& symfony --version | grep -E 'version\s*[.0-9]+' \
397408
&& webpack --version | grep -E '[.0-9]+' \
409+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
398410
&& wp --allow-root --version | grep -E '[.0-9]+' \
399411
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
400412
&& true

Dockerfiles/work/Dockerfile-5.5

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -296,6 +295,18 @@ RUN set -x \
296295
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
297296
&& rm -rf /tmp/y \
298297
\
298+
# wkhtmltopdf
299+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
300+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
301+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
302+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
303+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
304+
&& dpkg -i /tmp/wkhtmltopdf.deb \
305+
&& rm -f /tmp/wkhtmltopdf.deb \
306+
\
307+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
308+
&& rm -rf /var/lib/apt/lists/* \
309+
\
299310
# wpcli
300311
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
301312
&& chmod +x /usr/local/bin/wp \
@@ -409,6 +420,7 @@ RUN set -x \
409420
&& sass --version | grep -E '[.0-9]+' \
410421
&& symfony --version | grep -E 'version\s*[.0-9]+' \
411422
&& webpack --version | grep -E '[.0-9]+' \
423+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
412424
&& wp --allow-root --version | grep -E '[.0-9]+' \
413425
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
414426
&& true

Dockerfiles/work/Dockerfile-5.6

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -309,6 +308,18 @@ RUN set -x \
309308
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
310309
&& rm -rf /tmp/y \
311310
\
311+
# wkhtmltopdf
312+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
313+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
314+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
315+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
316+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
317+
&& dpkg -i /tmp/wkhtmltopdf.deb \
318+
&& rm -f /tmp/wkhtmltopdf.deb \
319+
\
320+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
321+
&& rm -rf /var/lib/apt/lists/* \
322+
\
312323
# wpcli
313324
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
314325
&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
423434
&& sass --version | grep -E '[.0-9]+' \
424435
&& symfony --version | grep -E 'version\s*[.0-9]+' \
425436
&& webpack --version | grep -E '[.0-9]+' \
437+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
426438
&& wp --allow-root --version | grep -E '[.0-9]+' \
427439
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
428440
&& true

Dockerfiles/work/Dockerfile-7.0

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -309,6 +308,18 @@ RUN set -x \
309308
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
310309
&& rm -rf /tmp/y \
311310
\
311+
# wkhtmltopdf
312+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
313+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
314+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
315+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
316+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
317+
&& dpkg -i /tmp/wkhtmltopdf.deb \
318+
&& rm -f /tmp/wkhtmltopdf.deb \
319+
\
320+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
321+
&& rm -rf /var/lib/apt/lists/* \
322+
\
312323
# wpcli
313324
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
314325
&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
423434
&& sass --version | grep -E '[.0-9]+' \
424435
&& symfony --version | grep -E 'version\s*[.0-9]+' \
425436
&& webpack --version | grep -E '[.0-9]+' \
437+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
426438
&& wp --allow-root --version | grep -E '[.0-9]+' \
427439
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
428440
&& true

Dockerfiles/work/Dockerfile-7.1

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -309,6 +308,18 @@ RUN set -x \
309308
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
310309
&& rm -rf /tmp/y \
311310
\
311+
# wkhtmltopdf
312+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
313+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
314+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
315+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
316+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
317+
&& dpkg -i /tmp/wkhtmltopdf.deb \
318+
&& rm -f /tmp/wkhtmltopdf.deb \
319+
\
320+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
321+
&& rm -rf /var/lib/apt/lists/* \
322+
\
312323
# wpcli
313324
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
314325
&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
423434
&& sass --version | grep -E '[.0-9]+' \
424435
&& symfony --version | grep -E 'version\s*[.0-9]+' \
425436
&& webpack --version | grep -E '[.0-9]+' \
437+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
426438
&& wp --allow-root --version | grep -E '[.0-9]+' \
427439
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
428440
&& true

Dockerfiles/work/Dockerfile-7.2

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -309,6 +308,18 @@ RUN set -x \
309308
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
310309
&& rm -rf /tmp/y \
311310
\
311+
# wkhtmltopdf
312+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
313+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
314+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
315+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
316+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
317+
&& dpkg -i /tmp/wkhtmltopdf.deb \
318+
&& rm -f /tmp/wkhtmltopdf.deb \
319+
\
320+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
321+
&& rm -rf /var/lib/apt/lists/* \
322+
\
312323
# wpcli
313324
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
314325
&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
423434
&& sass --version | grep -E '[.0-9]+' \
424435
&& symfony --version | grep -E 'version\s*[.0-9]+' \
425436
&& webpack --version | grep -E '[.0-9]+' \
437+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
426438
&& wp --allow-root --version | grep -E '[.0-9]+' \
427439
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
428440
&& true

Dockerfiles/work/Dockerfile-7.3

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -298,6 +297,18 @@ RUN set -x \
298297
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
299298
&& rm -rf /tmp/y \
300299
\
300+
# wkhtmltopdf
301+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
302+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
303+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
304+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
305+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
306+
&& dpkg -i /tmp/wkhtmltopdf.deb \
307+
&& rm -f /tmp/wkhtmltopdf.deb \
308+
\
309+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
310+
&& rm -rf /var/lib/apt/lists/* \
311+
\
301312
# wpcli
302313
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
303314
&& chmod +x /usr/local/bin/wp \
@@ -411,6 +422,7 @@ RUN set -x \
411422
&& sass --version | grep -E '[.0-9]+' \
412423
&& symfony --version | grep -E 'version\s*[.0-9]+' \
413424
&& webpack --version | grep -E '[.0-9]+' \
425+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
414426
&& wp --allow-root --version | grep -E '[.0-9]+' \
415427
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
416428
&& true

Dockerfiles/work/Dockerfile-7.4

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ RUN set -x \
106106
w3m \
107107
wget \
108108
whois \
109-
wkhtmltopdf \
110109
xz-utils \
111110
yarn \
112111
zip \
@@ -294,6 +293,18 @@ RUN set -x \
294293
&& yarn global add --prod --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
295294
&& rm -rf /tmp/y \
296295
\
296+
# wkhtmltopdf
297+
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
298+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
299+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
300+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
301+
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
302+
&& dpkg -i /tmp/wkhtmltopdf.deb \
303+
&& rm -f /tmp/wkhtmltopdf.deb \
304+
\
305+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
306+
&& rm -rf /var/lib/apt/lists/* \
307+
\
297308
# wpcli
298309
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
299310
&& chmod +x /usr/local/bin/wp \
@@ -406,6 +417,7 @@ RUN set -x \
406417
&& sass --version | grep -E '[.0-9]+' \
407418
&& symfony --version | grep -E 'version\s*[.0-9]+' \
408419
&& webpack --version | grep -E '[.0-9]+' \
420+
&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
409421
&& wp --allow-root --version | grep -E '[.0-9]+' \
410422
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
411423
&& true

0 commit comments

Comments
 (0)