From d30d6f61ea6baf5558c07768353b18b637386c89 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Fri, 1 Sep 2023 17:11:37 +0800 Subject: [PATCH 1/2] fix: php-fpm wkhtmltopdf ext need libssl3 --- php-fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 4191d5af..62256416 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1069,6 +1069,7 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ libfontconfig1 \ libx11-dev \ libjpeg62 \ + libssl-dev \ libxtst6 \ fontconfig \ libjpeg62-turbo \ From e909d0c7956f0827930f96c169f6f2039b75f0b0 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 2 Sep 2023 00:54:36 +0800 Subject: [PATCH 2/2] fix: php-fpm wkhtmltopdf --- php-fpm/Dockerfile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 62256416..8a10329f 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1069,16 +1069,30 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ libfontconfig1 \ libx11-dev \ libjpeg62 \ - libssl-dev \ libxtst6 \ fontconfig \ libjpeg62-turbo \ xfonts-base \ xfonts-75dpi \ wget \ - && wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}.bookworm_${ARCH}.deb" \ - && dpkg -i "wkhtmltox_${WKHTMLTOPDF_VERSION}.bookworm_${ARCH}.deb" \ - && apt -f install \ + # && cat /etc/os-release \ + && if [ ${LARADOCK_PHP_VERSION} = "5.6" ] || \ + [ ${LARADOCK_PHP_VERSION} = "7.0" ]; then \ + wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_${ARCH}.deb"; \ + dpkg -i "wkhtmltox_0.12.6-1.stretch_${ARCH}.deb"; \ + elif [ ${LARADOCK_PHP_VERSION} = "7.1" ] || \ + [ ${LARADOCK_PHP_VERSION} = "7.2" ] || \ + [ ${LARADOCK_PHP_VERSION} = "7.3" ] || \ + [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \ + wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${ARCH}.deb"; \ + dpkg -i "wkhtmltox_0.12.6-1.buster_${ARCH}.deb"; \ + elif [ ${LARADOCK_PHP_VERSION} = "8.0" ]; then \ + wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}.bullseye_${ARCH}.deb"; \ + dpkg -i "wkhtmltox_${WKHTMLTOPDF_VERSION}.bullseye_${ARCH}.deb"; \ + else \ + wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}.bookworm_${ARCH}.deb"; \ + dpkg -i "wkhtmltox_${WKHTMLTOPDF_VERSION}.bookworm_${ARCH}.deb"; \ + fi \ ;fi #####################################