Skip to content

Commit 12e5111

Browse files
cytopiacytopia
authored
Merge pull request #245 from mrLexx/bugfix/wkhtmltopdf
wkhtmltopdf new way of install (from wkhtmltopdf/packaging)
2 parents b4bfb84 + 40c2db6 commit 12e5111

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
@@ -354,12 +354,12 @@ fi \
354354
\
355355
\
356356
# -------------------- wkhtmltopdf --------------------
357-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
357+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
358358
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
359359
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
360360
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
361361
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
362-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
362+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
363363
&& dpkg -i /tmp/wkhtmltopdf.deb \
364364
&& rm -f /tmp/wkhtmltopdf.deb; \
365365
fi \

‎Dockerfiles/work/Dockerfile-5.5

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

‎Dockerfiles/work/Dockerfile-5.6

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

‎Dockerfiles/work/Dockerfile-7.0

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

‎Dockerfiles/work/Dockerfile-7.1

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

‎Dockerfiles/work/Dockerfile-7.2

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

‎Dockerfiles/work/Dockerfile-7.3

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

‎Dockerfiles/work/Dockerfile-7.4

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

0 commit comments

Comments
 (0)