Merge pull request #102 from devilbox/release-0.78

Use QT-patched version of wkhtmltopdf

Dockerfiles/work/Dockerfile-5.2

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -218,6 +217,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # yamllint
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && 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 \
 	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 

Dockerfiles/work/Dockerfile-5.3

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -256,6 +255,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& 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 \
 	&& chmod +x /usr/local/bin/wp \
@@ -362,6 +373,7 @@ RUN set -x \
 	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-5.4

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -285,6 +284,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -395,6 +406,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-5.5

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -296,6 +295,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -409,6 +420,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-5.6

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -309,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.0

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -309,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.1

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -309,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.2

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -309,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -423,6 +434,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.3

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -298,6 +297,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -411,6 +422,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.4

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -294,6 +293,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -406,6 +417,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-8.0

@@ -106,7 +106,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \
@@ -229,6 +228,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -333,6 +344,7 @@ RUN set -x \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -125,7 +125,6 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		wkhtmltopdf \
 		xz-utils \
 		yarn \
 		zip \

build/ansible/group_vars/all.yml

@@ -227,6 +227,7 @@ software_enabled:
   - sass
   - symfony
   - webpack
+  - wkhtmltopdf
   - wpcli
   - yamllint
   # Cleanup needs to be last
@@ -652,6 +653,28 @@ software_available:
     all:
       command: curl https://symfony.com/installer -L -o /usr/local/bin/symfony
       post: chmod +x /usr/local/bin/symfony
+  wkhtmltopdf:
+    check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)"
+    5.2:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    5.3:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    5.4:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    5.5:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    all:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )"
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+        && curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+        && dpkg -i /tmp/wkhtmltopdf.deb \
+        && rm -f /tmp/wkhtmltopdf.deb \
+      post: |
+        DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+        && rm -rf /var/lib/apt/lists/* \
   wpcli:
     disabled: [5.2]
     check: wp --allow-root --version | grep -E '[.0-9]+'