From 899d936f7a98a200a85f7460be6cc0686ca8057d Mon Sep 17 00:00:00 2001 From: Christopher Wilkinson Date: Tue, 23 Apr 2019 16:35:50 +0100 Subject: [PATCH] Add WKHTMLTOPDF for use in .env file if desired --- Dockerfile | 9 +++++++++ Dockerfile.aarch64 | 9 +++++++++ Dockerfile.armhf | 9 +++++++++ README.md | 13 +++++++++---- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d95f3a3..c201f4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,15 @@ RUN \ php7-simplexml \ php7-tidy \ php7-tokenizer && \ + echo "**** install wkhtmltopdf ****" && \ + apk add --no-cache \ + ttf-freefont \ + fontconfig && \ + apk add --no-cache \ + --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \ + --allow-untrusted \ + qt5-qtbase-dev \ + wkhtmltopdf && \ echo "**** configure php-fpm ****" && \ sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 50cb8fe..e6eaee7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,6 +30,15 @@ RUN \ php7-simplexml \ php7-tidy \ php7-tokenizer && \ + echo "**** install wkhtmltopdf ****" && \ + apk add --no-cache \ + ttf-freefont \ + fontconfig && \ + apk add --no-cache \ + --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \ + --allow-untrusted \ + qt5-qtbase-dev \ + wkhtmltopdf && \ echo "**** configure php-fpm ****" && \ sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1f8c864..a60dd76 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -30,6 +30,15 @@ RUN \ php7-simplexml \ php7-tidy \ php7-tokenizer && \ + echo "**** install wkhtmltopdf ****" && \ + apk add --no-cache \ + ttf-freefont \ + fontconfig && \ + apk add --no-cache \ + --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \ + --allow-untrusted \ + qt5-qtbase-dev \ + wkhtmltopdf && \ echo "**** configure php-fpm ****" && \ sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ diff --git a/README.md b/README.md index 563402f..0d379ee 100644 --- a/README.md +++ b/README.md @@ -144,18 +144,23 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel   ## Application Setup -Default username is admin@admin.com with password of **password**, access the container at http://dockerhost:6875. +The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875. -This application is dependent on an MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. +This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. If you intend to use this application behind a subfolder reverse proxy, such as our LetsEncrypt container or Traefik you will need to make sure that the `APP_URL` environment variable is set, or it will not work Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ ### Advanced Users (full control over the .env file) -If you wish to use the extra functionality of BookStack such as email, memcache, ldap and so on you will need to make your own .env file with guidance from the BookStack documentation. +If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. -When you create the container, do not set any arguments for any SQL settings, or APP_URL. The container will copy an .env file to /config/www/.env on your host system for you to edit. +When you create the container, do not set any arguments for any SQL settings, or APP_URL. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. + +#### PDF Rendering +[wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. + +The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`.