Updated to 0.31.8

Author: Zeigren

Dockerfile

@@ -20,13 +20,13 @@ ENV BOOKSTACK_HOME="/var/www/bookstack"
 
 RUN apk update \
     && apk add --no-cache git zip unzip fontconfig ttf-freefont wkhtmltopdf \
-    tidyhtml-dev openldap-dev \
+    openldap-dev \
     && apk add --no-cache --virtual .build-deps \
     $PHPIZE_DEPS libpng-dev freetype-dev libjpeg-turbo-dev \
     && docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg \
     && docker-php-ext-configure ldap \
     && docker-php-ext-configure opcache --enable-opcache \
-    && docker-php-ext-install pdo_mysql tidy gd ldap opcache \
+    && docker-php-ext-install pdo_mysql gd ldap opcache \
     && cd /var/www && curl -sS https://getcomposer.org/installer | php \
     && mv /var/www/composer.phar /usr/local/bin/composer \
     && BOOKSTACK_VERSION=$( echo $VERSION | grep -Eo [0-9.]+ | head -1 ) \

README.md

@@ -1,14 +1,15 @@
 # Docker Stack For [BookStack](https://github.com/BookStackApp/BookStack)
 
 [![DockerHub](https://img.shields.io/docker/cloud/build/zeigren/bookstack)](https://hub.docker.com/r/zeigren/bookstack)
-[![MicroBadger](https://images.microbadger.com/badges/image/zeigren/bookstack.svg)](https://microbadger.com/images/zeigren/bookstack)
+![Docker Image Size (latest)](https://img.shields.io/docker/image-size/zeigren/bookstack/latest)
 [![MicroBadger](https://images.microbadger.com/badges/version/zeigren/bookstack.svg)](https://microbadger.com/images/zeigren/bookstack)
 [![MicroBadger](https://images.microbadger.com/badges/commit/zeigren/bookstack.svg)](https://microbadger.com/images/zeigren/bookstack)
 ![Docker Pulls](https://img.shields.io/docker/pulls/zeigren/bookstack)
 
 ## Tags
 
 - latest
+- 0.31.8
 - 0.30.1
 - 0.30.0
 - 0.29.3

bookstack_vhost.conf

@@ -10,7 +10,7 @@ server {
     listen [::]:80;
 
     #UNCOMMENT IF YOU'RE USING A DOMAIN NAME
-    #server_name bookstack.yourdomain.com;
+    #server_name bookstack.yourdomain.test;
     root /var/www/bookstack/public;
 
     index index.php;

bookstack_vhost_ssl.conf

@@ -9,12 +9,12 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
 
-    server_name bookstack.yourdomain.com;
+    server_name bookstack.yourdomain.test;
     root /var/www/bookstack/public;
 
     # SSL
-    ssl_certificate /etc/nginx/certs/yourdomain.com.crt;
-    ssl_certificate_key /etc/nginx/certs/yourdomain.com.key;
+    ssl_certificate /etc/nginx/certs/yourdomain.test.crt;
+    ssl_certificate_key /etc/nginx/certs/yourdomain.test.key;
 
     index index.php;
 
@@ -80,6 +80,6 @@ server {
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
-    server_name bookstack.yourdomain.com;
+    server_name bookstack.yourdomain.test;
     return 301 https://$host$request_uri;
 }

docker-compose.yml

@@ -4,10 +4,10 @@ services:
     image: nginx:alpine
     volumes:
       - bookstack_public:/var/www/bookstack/public
+      - ./config/bookstack_vhost.conf:/etc/nginx/conf.d/default.conf
       # UNCOMMENT IF USING NGINX FOR SSL TERMINATION
-      # - ./config/bookstack_vhost.conf:/etc/nginx/conf.d/default.conf
-      # - ./config/yourdomain.com.crt:/etc/nginx/certs/yourdomain.com.crt
-      # - ./config/yourdomain.com.key:/etc/nginx/certs/yourdomain.com.key
+      # - ./config/yourdomain.test.crt:/etc/nginx/certs/yourdomain.test.crt
+      # - ./config/yourdomain.test.key:/etc/nginx/certs/yourdomain.test.key
     depends_on:
       - bookstack
     networks:

docker-entrypoint.sh

@@ -190,6 +190,7 @@ LDAP_DN=${LDAP_DN:-false}
 LDAP_PASS=${LDAP_PASS:-false}
 LDAP_USER_FILTER=${LDAP_USER_FILTER:-false}
 LDAP_VERSION=${LDAP_VERSION:-false}
+LDAP_START_TLS=${LDAP_START_TLS:-false}
 LDAP_TLS_INSECURE=${LDAP_TLS_INSECURE:-false}
 LDAP_ID_ATTRIBUTE=${LDAP_ID_ATTRIBUTE:-uid}
 LDAP_EMAIL_ATTRIBUTE=${LDAP_EMAIL_ATTRIBUTE:-mail}
@@ -229,9 +230,9 @@ DISABLE_EXTERNAL_SERVICES=${DISABLE_EXTERNAL_SERVICES:-false}
 # If set, Avatars will be fetched regardless of DISABLE_EXTERNAL_SERVICES option.
 AVATAR_URL=${AVATAR_URL:-}
 
-# Enable draw.io integration
+# Enable diagrams.net integration
 # Can simply be true/false to enable/disable the integration.
-# Alternatively, It can be URL to the draw.io instance you want to use.
+# Alternatively, It can be URL to the diagrams.net instance you want to use.
 # For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1
 DRAWIO=${DRAWIO:-true}
 
@@ -240,12 +241,25 @@ DRAWIO=${DRAWIO:-true}
 # Can be 'list' or 'grid'
 APP_VIEWS_BOOKS=${APP_VIEWS_BOOKS:-list}
 APP_VIEWS_BOOKSHELVES=${APP_VIEWS_BOOKSHELVES:-grid}
+APP_VIEWS_BOOKSHELF=${APP_VIEWS_BOOKSHELF:-grid}
+
+# Use dark mode by default
+# Will be overriden by any user/session preference.
+APP_DEFAULT_DARK_MODE=${APP_DEFAULT_DARK_MODE:-false}
 
 # Page revision limit
 # Number of page revisions to keep in the system before deleting old revisions.
 # If set to 'false' a limit will not be enforced.
 REVISION_LIMIT=${REVISION_LIMIT:-50}
 
+# Recycle Bin Lifetime
+# The number of days that content will remain in the recycle bin before
+# being considered for auto-removal. It is not a guarantee that content will
+# be removed after this time.
+# Set to 0 for no recycle bin functionality.
+# Set to -1 for unlimited recycle bin lifetime.
+RECYCLE_BIN_LIFETIME=${RECYCLE_BIN_LIFETIME:-30}
+
 # Allow <script> tags in page content
 # Note, if set to 'true' the page editor may still escape scripts.
 ALLOW_CONTENT_SCRIPTS=${ALLOW_CONTENT_SCRIPTS:-false}
@@ -256,6 +270,12 @@ ALLOW_CONTENT_SCRIPTS=${ALLOW_CONTENT_SCRIPTS:-false}
 # Contents of the robots.txt file can be overridden, making this option obsolete.
 ALLOW_ROBOTS=${ALLOW_ROBOTS:-null}
 
+# A list of hosts that BookStack can be iframed within.
+# Space separated if multiple. BookStack host domain is auto-inferred.
+# For Example: ALLOWED_IFRAME_HOSTS="https://example.com https://a.example.com"
+# Setting this option will also auto-adjust cookies to be SameSite=None.
+ALLOWED_IFRAME_HOSTS=${ALLOWED_IFRAME_HOSTS:-null}
+
 # The default and maximum item-counts for listing API requests.
 API_DEFAULT_ITEM_COUNT=${API_DEFAULT_ITEM_COUNT:-100}
 API_MAX_ITEM_COUNT=${API_MAX_ITEM_COUNT:-500}

docker-swarm-traefik.yml

@@ -17,10 +17,10 @@ services:
         - "traefik.enable=true"
         - "traefik.docker.network=traefik"
         - "traefik.http.routers.bookstack-http.entrypoints=web"
-        - "traefik.http.routers.bookstack-http.rule=Host(`bookstack.yourdomain.com`)"
+        - "traefik.http.routers.bookstack-http.rule=Host(`bookstack.yourdomain.test`)"
         - "traefik.http.routers.bookstack-http.middlewares=bookstack-https@docker"
         - "traefik.http.routers.bookstack.entrypoints=websecure"
-        - "traefik.http.routers.bookstack.rule=Host(`bookstack.yourdomain.com`)"
+        - "traefik.http.routers.bookstack.rule=Host(`bookstack.yourdomain.test`)"
         - "traefik.http.routers.bookstack.tls=true"
         - "traefik.http.routers.bookstack.tls.certresolver=myresolver"
         - "traefik.http.services.bookstack.loadbalancer.server.port=80"
@@ -30,7 +30,7 @@ services:
         - "traefik.http.middlewares.bookstack.headers.stsseconds=315360000"
         - "traefik.http.services.bookstack.loadbalancer.passhostheader=true"
         - "traefik.http.middlewares.bookstack.headers.sslforcehost=true"
-        - "traefik.http.middlewares.bookstack.headers.sslhost=bookstack.yourdomain.com"
+        - "traefik.http.middlewares.bookstack.headers.sslhost=bookstack.yourdomain.test"
         - "traefik.http.middlewares.bookstack.headers.browserxssfilter=true"
         - "traefik.http.middlewares.bookstack.headers.contenttypenosniff=true"
         - "traefik.http.middlewares.bookstack.headers.forcestsheader=true"
@@ -62,7 +62,7 @@ services:
     - DB_DATABASE=bookstack
     - DB_USERNAME=bookstack
     - DB_PASSWORD=DOCKER-SECRET->bookstacksql_password
-    - APP_URL=https://bookstack.yourdomain.com
+    - APP_URL=https://bookstack.yourdomain.test
     - CACHE_DRIVER=redis
     - SESSION_DRIVER=redis
     - STORAGE_TYPE=local

docker-swarm.yml

@@ -18,10 +18,10 @@ services:
         target: /etc/nginx/conf.d/default.conf
     # UNCOMMENT IF USING NGINX FOR SSL TERMINATION
     # secrets:
-    #   - source: yourdomain.com.crt
-    #     target: /etc/nginx/certs/yourdomain.com.crt
-    #   - source: yourdomain.com.key
-    #     target: /etc/nginx/certs/yourdomain.com.key
+    #   - source: yourdomain.test.crt
+    #     target: /etc/nginx/certs/yourdomain.test.crt
+    #   - source: yourdomain.test.key
+    #     target: /etc/nginx/certs/yourdomain.test.key
 
   mariadb:
     image: mariadb:latest
@@ -81,9 +81,9 @@ secrets:
   bookstacksql_password:
     external: true
   # UNCOMMENT IF USING NGINX FOR SSL TERMINATION
-  # yourdomain.com.crt:
+  # yourdomain.test.crt:
   #   external: true
-  # yourdomain.com.key:
+  # yourdomain.test.key:
   #   external: true
 
 networks:

traefik.yml

@@ -11,14 +11,15 @@ services:
       - "--entrypoints.web.address=:80"
       - "--entrypoints.websecure.address=:443"
       - "--certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web"
-      - "--certificatesResolvers.myresolver.acme.email=EMAIL@CHANGEME.COM"
+      - "--certificatesResolvers.myresolver.acme.email=EMAIL@CHANGEME.TEST"
+      - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
     ports:
       - "80:80"
       - "443:443"
       - "8080:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - traefik:/etc/traefik/acme
+      - traefik:/letsencrypt
     networks:
       - traefik