Skip to content

Commit 8b9dbdf

Browse files
cytopiacytopia
committed
Fix build of wkhtmltopdf
1 parent fdc024f commit 8b9dbdf

3 files changed

Lines changed: 13 additions & 43 deletions

File tree

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@ RUN set -eux \
251251
\
252252
\
253253
# -------------------- wkhtmltopdf --------------------
254-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
254+
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
255255
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
256256
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
257-
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
257+
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
258258
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
259259
&& dpkg -i /tmp/wkhtmltopdf.deb \
260260
&& rm -f /tmp/wkhtmltopdf.deb \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,10 @@ RUN set -eux \
301301
\
302302
\
303303
# -------------------- wkhtmltopdf --------------------
304-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
304+
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
305305
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
306306
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
307-
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
307+
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
308308
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
309309
&& dpkg -i /tmp/wkhtmltopdf.deb \
310310
&& rm -f /tmp/wkhtmltopdf.deb \

‎build/ansible/group_vars/all/work.yml‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -937,67 +937,37 @@ software_available:
937937
post: chmod +x /usr/local/bin/symfony
938938
wkhtmltopdf:
939939
check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"
940-
5.2:
941-
pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
942-
5.3:
943-
pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
944940
5.4:
945941
pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
946-
5.5:
947-
pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
948-
7.1:
949-
command: |
950-
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
951-
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
952-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
953-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
954-
&& dpkg -i /tmp/wkhtmltopdf.deb \
955-
&& rm -f /tmp/wkhtmltopdf.deb \
956-
7.2:
957-
command: |
958-
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
959-
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
960-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
961-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
962-
&& dpkg -i /tmp/wkhtmltopdf.deb \
963-
&& rm -f /tmp/wkhtmltopdf.deb \
964-
7.3:
965-
command: |
966-
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
967-
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
968-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
969-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
970-
&& dpkg -i /tmp/wkhtmltopdf.deb \
971-
&& rm -f /tmp/wkhtmltopdf.deb \
972-
7.4:
973942
command: |
974943
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
975944
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
976-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
945+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
977946
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
978947
&& dpkg -i /tmp/wkhtmltopdf.deb \
979948
&& rm -f /tmp/wkhtmltopdf.deb \
980-
8.0:
949+
5.5:
950+
pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
981951
command: |
982952
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
983953
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
984-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
954+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
985955
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
986956
&& dpkg -i /tmp/wkhtmltopdf.deb \
987957
&& rm -f /tmp/wkhtmltopdf.deb \
988-
8.1:
958+
5.6:
989959
command: |
990960
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
991961
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
992-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
962+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
993963
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
994964
&& dpkg -i /tmp/wkhtmltopdf.deb \
995965
&& rm -f /tmp/wkhtmltopdf.deb \
996-
8.2:
966+
7.0:
997967
command: |
998968
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
999969
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
1000-
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
970+
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
1001971
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
1002972
&& dpkg -i /tmp/wkhtmltopdf.deb \
1003973
&& rm -f /tmp/wkhtmltopdf.deb \
@@ -1006,7 +976,7 @@ software_available:
1006976
command: |
1007977
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
1008978
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
1009-
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
979+
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
1010980
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
1011981
&& dpkg -i /tmp/wkhtmltopdf.deb \
1012982
&& rm -f /tmp/wkhtmltopdf.deb \

0 commit comments

Comments
 (0)