diff --git a/.env.example b/.env.example index ffc6e794..fe92fb2d 100644 --- a/.env.example +++ b/.env.example @@ -194,7 +194,7 @@ WORKSPACE_SSH_PORT=2222 WORKSPACE_INSTALL_FFMPEG=false WORKSPACE_INSTALL_AUDIOWAVEFORM=false WORKSPACE_INSTALL_WKHTMLTOPDF=false -WORKSPACE_WKHTMLTOPDF_VERSION=0.12.6-1 +WORKSPACE_WKHTMLTOPDF_VERSION=0.12.6.1-3 WORKSPACE_INSTALL_GNU_PARALLEL=false WORKSPACE_INSTALL_AST=true WORKSPACE_AST_VERSION=1.0.10 @@ -278,7 +278,7 @@ PHP_FPM_INSTALL_PING=false PHP_FPM_INSTALL_SSHPASS=false PHP_FPM_INSTALL_MAILPARSE=false PHP_FPM_INSTALL_WKHTMLTOPDF=false -PHP_FPM_KHTMLTOPDF_VERSION=0.12.6-1 +PHP_FPM_KHTMLTOPDF_VERSION=0.12.6.1-3 PHP_FPM_INSTALL_XLSWRITER=false PHP_FPM_INSTALL_PHPDECIMAL=false PHP_FPM_INSTALL_ZOOKEEPER=false diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 7012acb7..0d527401 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1056,7 +1056,7 @@ RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \ USER root ARG INSTALL_WKHTMLTOPDF=false -ARG WKHTMLTOPDF_VERSION=0.12.6-1 +ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ ARCH=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \ @@ -1071,8 +1071,8 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ xfonts-base \ xfonts-75dpi \ wget \ - && wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_0.12.6-1.stretch_${ARCH}.deb" \ - && dpkg -i "wkhtmltox_${WKHTMLTOPDF_VERSION}.stretch_${ARCH}.deb" \ + && 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 \ ;fi