From 607fecb0bf71375d923be37b4238bd540c9b6622 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 6 May 2023 02:20:57 +0100
Subject: [PATCH] Added requirements for bookstack-system-cli

Added required ZIP extension and mariadb-client package to provide
mysqldump which is required by the CLI for backing up.
---
 Dockerfile                                            | 2 ++
 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0ff44dd..6d2837d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,8 @@ RUN \
     php81-pecl-memcached \
     php81-phar \
     php81-tokenizer \
+    php81-zip \
+    mariadb-client \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
index a4da96b..1b683e6 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
@@ -3,7 +3,7 @@
 
 # create directory structure
 mkdir -p \
-    /config/www/{uploads,files,images,themes}
+    /config/www/{uploads,files,images,themes,backups}
 
 # check for .env and copy default if needed
 if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then
@@ -13,6 +13,7 @@ fi
 # create symlinks
 symlinks=(
     /app/www/themes
+    /app/www/storage/backups
     /app/www/storage/uploads/files
     /app/www/storage/uploads/images
     /app/www/public/uploads