Merge pull request #102 from devilbox/release-0.78

Use QT-patched version of wkhtmltopdf

Dockerfiles/mods/Dockerfile-5.3

@@ -176,7 +176,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

Dockerfiles/mods/Dockerfile-5.4

@@ -176,7 +176,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

Dockerfiles/mods/Dockerfile-5.5

@@ -171,7 +171,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

Dockerfiles/mods/Dockerfile-5.6

@@ -186,7 +186,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

Dockerfiles/mods/Dockerfile-7.0

@@ -236,6 +236,7 @@ RUN set -x \
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
+	&& git checkout origin/php7 \
 	&& phpize \
 	&& ./configure  --with-zlib-dir=/usr \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
@@ -328,7 +329,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
 # ---- Installing PHP Extension: pdo_sqlsrv ----
-	&& pecl install pdo_sqlsrv \
+	&& pecl install pdo_sqlsrv-5.3.0 \
 	&& docker-php-ext-enable pdo_sqlsrv \
 	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
@@ -392,7 +393,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
 # ---- Installing PHP Extension: sqlsrv ----
-	&& pecl install sqlsrv \
+	&& pecl install sqlsrv-5.3.0 \
 	&& docker-php-ext-enable sqlsrv \
 	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \

Dockerfiles/mods/Dockerfile-7.1

@@ -236,6 +236,7 @@ RUN set -x \
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
+	&& git checkout origin/php7 \
 	&& phpize \
 	&& ./configure  --with-zlib-dir=/usr \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \

Dockerfiles/mods/Dockerfile-7.2

@@ -237,6 +237,7 @@ RUN set -x \
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
+	&& git checkout origin/php7 \
 	&& phpize \
 	&& ./configure  --with-zlib-dir=/usr \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \

Dockerfiles/mods/Dockerfile-7.3

@@ -299,7 +299,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
 # ---- Installing PHP Extension: pdo_sqlsrv ----
-	&& pecl install pdo_sqlsrv-5.5.0preview \
+	&& pecl install pdo_sqlsrv \
 	&& docker-php-ext-enable pdo_sqlsrv \
 	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
@@ -363,7 +363,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
 # ---- Installing PHP Extension: sqlsrv ----
-	&& pecl install sqlsrv-5.5.0preview \
+	&& pecl install sqlsrv \
 	&& docker-php-ext-enable sqlsrv \
 	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
@@ -425,7 +425,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/wddx || true) \
 	\
 # ---- Installing PHP Extension: xdebug ----
-	&& pecl install xdebug-2.7.0RC1 \
+	&& pecl install xdebug-2.7.0RC2 \
 	&& docker-php-ext-enable xdebug \
 	&& (rm -rf /usr/local/lib/php/test/xdebug || true) \
 	&& (rm -rf /usr/local/lib/php/doc/xdebug || true) \

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

README.md

@@ -1,21 +1,65 @@
 # PHP-FPM Docker images
 
 [![Build Status](https://travis-ci.org/devilbox/docker-php-fpm.svg?branch=master)](https://travis-ci.org/devilbox/docker-php-fpm)
-[![release](https://img.shields.io/github/release/devilbox/docker-php-fpm.svg)](https://github.com/devilbox/docker-php-fpm/releases)
-[![Join the chat at https://gitter.im/devilbox/Lobby](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Github](https://img.shields.io/badge/github-docker--php--fpm-red.svg)](https://github.com/devilbox/docker-php-fpm)
-[![](https://images.microbadger.com/badges/license/devilbox/php-fpm.svg)](https://microbadger.com/images/devilbox/php-fpm "php-fpm")
-
-**[devilbox/docker-php-fpm](https://github.com/devilbox/docker-php-fpm)**
+[![Release](https://img.shields.io/github/release/devilbox/docker-php-fpm.svg?colorB=orange)](https://github.com/devilbox/docker-php-fpm/releases)
+[![Gitter](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Discourse](https://img.shields.io/discourse/https/devilbox.discourse.group/status.svg?colorB=%234CB697)](https://devilbox.discourse.group)
+[![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
 
 This repository will provide you fully functional PHP-FPM Docker images in different flavours,
-versions and packed with different types of integrated PHP modules. It also solves the problem of [syncronizing file permissions](#unsynchronized-permissions) of mounted volumes between the host and the container.
+versions and packed with different types of integrated PHP modules. It also solves the problem of **[syncronizing file permissions](#unsynchronized-permissions)** of mounted volumes between the host and the container.
 
 | Docker Hub | Upstream Project |
 |------------|------------------|
 | <a href="https://hub.docker.com/r/devilbox/php-fpm"><img height="82px" src="http://dockeri.co/image/devilbox/php-fpm" /></a> | <a href="https://github.com/cytopia/devilbox" ><img height="82px" src="https://raw.githubusercontent.com/devilbox/artwork/master/submissions_banner/cytopia/01/png/banner_256_trans.png" /></a> |
 
----
+#### Base Images
+
+Have a look at the following Devilbox base images for which no official versions exist yet, but are required to serve as a foundation for this repository:
+
+* [PHP-FPM 5.2](https://github.com/devilbox/docker-php-fpm-5.2)
+* [PHP-FPM 5.3](https://github.com/devilbox/docker-php-fpm-5.3)
+* [PHP-FPM 7.4](https://github.com/devilbox/docker-php-fpm-7.4)
+* [PHP-FPM 8.0](https://github.com/devilbox/docker-php-fpm-8.0)
+
+#### Documentation
+
+In case you seek help, go and visit the community pages.
+
+<table width="100%" style="width:100%; display:table;">
+ <thead>
+  <tr>
+   <th width="33%" style="width:33%;"><h3><a target="_blank" href="https://devilbox.readthedocs.io">Documentation</a></h3></th>
+   <th width="33%" style="width:33%;"><h3><a target="_blank" href="https://gitter.im/devilbox/Lobby">Chat</a></h3></th>
+   <th width="33%" style="width:33%;"><h3><a target="_blank" href="https://devilbox.discourse.group">Forum</a></h3></th>
+  </tr>
+ </thead>
+ <tbody style="vertical-align: middle; text-align: center;">
+  <tr>
+   <td>
+    <a target="_blank" href="https://devilbox.readthedocs.io">
+     <img title="Documentation" name="Documentation" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/readthedocs.png" />
+    </a>
+   </td>
+   <td>
+    <a target="_blank" href="https://gitter.im/devilbox/Lobby">
+     <img title="Chat on Gitter" name="Chat on Gitter" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/gitter.png" />
+    </a>
+   </td>
+   <td>
+    <a target="_blank" href="https://devilbox.discourse.group">
+     <img title="Devilbox Forums" name="Forum" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/discourse.png" />
+    </a>
+   </td>
+  </tr>
+  <tr>
+  <td><a target="_blank" href="https://devilbox.readthedocs.io">devilbox.readthedocs.io</a></td>
+  <td><a target="_blank" href="https://gitter.im/devilbox/Lobby">gitter.im/devilbox</a></td>
+  <td><a target="_blank" href="https://devilbox.discourse.group">devilbox.discourse.group</a></td>
+  </tr>
+ </tbody>
+</table>
+
 
 #### Table of Contents
 

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]+'
@@ -1016,6 +1039,18 @@ extensions_available:
     5.2:
       type: pecl
       version: 2.0.7
+    5.3:
+      type: pecl
+      version: 2.0.8
+    5.4:
+      type: pecl
+      version: 2.0.8
+    5.5:
+      type: pecl
+      version: 2.0.8
+    5.6:
+      type: pecl
+      version: 2.0.8
     all:
       type: pecl
   imagick:
@@ -1109,14 +1144,17 @@ extensions_available:
     7.0:
       type: git
       git_url: https://github.com/websupport-sk/pecl-memcache
+      git_ref: origin/php7
       configure: --with-zlib-dir=/usr
     7.1:
       type: git
       git_url: https://github.com/websupport-sk/pecl-memcache
+      git_ref: origin/php7
       configure: --with-zlib-dir=/usr
     7.2:
       type: git
       git_url: https://github.com/websupport-sk/pecl-memcache
+      git_ref: origin/php7
       configure: --with-zlib-dir=/usr
     all:
       type: pecl
@@ -1314,9 +1352,9 @@ extensions_available:
     already_avail: "{{ php_all_versions }}"
   pdo_sqlsrv:
     disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
-    7.3:
+    7.0:
       type: pecl
-      version: 5.5.0preview
+      version: 5.3.0
       build_dep: [unixodbc-dev]
       run_dep: [unixodbc]
     all:
@@ -1455,9 +1493,9 @@ extensions_available:
     already_avail: "{{ php_all_versions }}"
   sqlsrv:
     disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
-    7.3:
+    7.0:
       type: pecl
-      version: 5.5.0preview
+      version: 5.3.0
       build_dep: [unixodbc-dev]
       run_dep: [unixodbc]
     all:
@@ -1598,7 +1636,7 @@ extensions_available:
       version: 2.4.1
     7.3:
       type: pecl
-      version: 2.7.0RC1
+      version: 2.7.0RC2
     all:
       type: pecl
   xml: