Skip to content

Commit b7a52ff

Browse files
mrLexxmrLexx
committed
wkhtmltopdf new way of install (from wkhtmltopdf/packaging)
1 parent 14f9ebe commit b7a52ff

File tree

14 files changed

+38
-38
lines changed

14 files changed

+38
-38
lines changed

‎Dockerfiles/work/Dockerfile-5.2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,12 @@ fi \
264264
\
265265
\
266266
# -------------------- wkhtmltopdf --------------------
267-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
267+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
268268
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
269269
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
270270
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
271271
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
272-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
272+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
273273
&& dpkg -i /tmp/wkhtmltopdf.deb \
274274
&& rm -f /tmp/wkhtmltopdf.deb; \
275275
fi \

‎Dockerfiles/work/Dockerfile-5.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,12 @@ fi \
318318
\
319319
\
320320
# -------------------- wkhtmltopdf --------------------
321-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
321+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
322322
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
323323
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
324324
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
325325
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
326-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
326+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
327327
&& dpkg -i /tmp/wkhtmltopdf.deb \
328328
&& rm -f /tmp/wkhtmltopdf.deb; \
329329
fi \

‎Dockerfiles/work/Dockerfile-5.4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,12 @@ fi \
352352
&& chmod +x /usr/local/bin/symfony \
353353
\
354354
# -------------------- wkhtmltopdf --------------------
355-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
355+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
356356
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
357357
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
358358
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
359359
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
360-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
360+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
361361
&& dpkg -i /tmp/wkhtmltopdf.deb \
362362
&& rm -f /tmp/wkhtmltopdf.deb; \
363363
fi \

‎Dockerfiles/work/Dockerfile-5.5

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,12 +358,12 @@ fi \
358358
&& chmod +x /usr/local/bin/symfony \
359359
\
360360
# -------------------- wkhtmltopdf --------------------
361-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
361+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
362362
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
363363
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
364364
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
365365
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
366-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
366+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
367367
&& dpkg -i /tmp/wkhtmltopdf.deb \
368368
&& rm -f /tmp/wkhtmltopdf.deb; \
369369
fi \

‎Dockerfiles/work/Dockerfile-5.6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,12 @@ fi \
378378
&& chmod +x /usr/local/bin/symfony \
379379
\
380380
# -------------------- wkhtmltopdf --------------------
381-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
381+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
382382
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
383383
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
384384
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
385385
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
386-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
386+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
387387
&& dpkg -i /tmp/wkhtmltopdf.deb \
388388
&& rm -f /tmp/wkhtmltopdf.deb; \
389389
fi \

‎Dockerfiles/work/Dockerfile-7.0

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,12 @@ fi \
359359
&& chmod +x /usr/local/bin/symfony \
360360
\
361361
# -------------------- wkhtmltopdf --------------------
362-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
362+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
363363
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
364364
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
365365
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
366366
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
367-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
367+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
368368
&& dpkg -i /tmp/wkhtmltopdf.deb \
369369
&& rm -f /tmp/wkhtmltopdf.deb; \
370370
fi \

‎Dockerfiles/work/Dockerfile-7.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,12 @@ fi \
352352
&& chmod +x /usr/local/bin/symfony \
353353
\
354354
# -------------------- wkhtmltopdf --------------------
355-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
355+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
356356
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
357357
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
358358
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
359359
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
360-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
360+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
361361
&& dpkg -i /tmp/wkhtmltopdf.deb \
362362
&& rm -f /tmp/wkhtmltopdf.deb; \
363363
fi \

‎Dockerfiles/work/Dockerfile-7.2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,12 @@ fi \
372372
&& chmod +x /usr/local/bin/symfony \
373373
\
374374
# -------------------- wkhtmltopdf --------------------
375-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
375+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
376376
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
377377
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
378378
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
379379
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
380-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
380+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
381381
&& dpkg -i /tmp/wkhtmltopdf.deb \
382382
&& rm -f /tmp/wkhtmltopdf.deb; \
383383
fi \

‎Dockerfiles/work/Dockerfile-7.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,12 +373,12 @@ fi \
373373
&& chmod +x /usr/local/bin/symfony \
374374
\
375375
# -------------------- wkhtmltopdf --------------------
376-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
376+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
377377
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
378378
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
379379
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
380380
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
381-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
381+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
382382
&& dpkg -i /tmp/wkhtmltopdf.deb \
383383
&& rm -f /tmp/wkhtmltopdf.deb; \
384384
fi \

‎Dockerfiles/work/Dockerfile-7.4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,12 +373,12 @@ fi \
373373
&& chmod +x /usr/local/bin/symfony \
374374
\
375375
# -------------------- wkhtmltopdf --------------------
376-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
376+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
377377
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
378378
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
379379
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
380380
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
381-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
381+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
382382
&& dpkg -i /tmp/wkhtmltopdf.deb \
383383
&& rm -f /tmp/wkhtmltopdf.deb; \
384384
fi \

0 commit comments

Comments
 (0)