Merge pull request #173 from ssddanbrown/system-cli-support

Author: thespad

Dockerfile

@@ -9,13 +9,14 @@ ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
-# package versions
+# package versions
 ARG BOOKSTACK_RELEASE
 
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     fontconfig \
+    mariadb-client \
     memcached \
     php82-dom \
     php82-gd \

Dockerfile.aarch64

@@ -9,13 +9,14 @@ ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
-# package versions
+# package versions
 ARG BOOKSTACK_RELEASE
 
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     fontconfig \
+    mariadb-client \
     memcached \
     php82-dom \
     php82-gd \

README.md

@@ -81,6 +81,7 @@ Below is a mapping of container `/config` paths to those relative within a BookS
 - **/config container path** => **BookStack relative path**
 - `/config/www/.env` => `.env`
 - `/config/www/laravel.log` => `storage/logs/laravel.log`
+- `/config/www/backups/` => `storage/backups/`
 - `/config/www/files/` => `storage/uploads/files/`
 - `/config/www/images/` => `storage/uploads/images/`
 - `/config/www/themes/` => `themes/`
@@ -290,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.06.23:** - Add mariadb-client for bookstack-system-cli support.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **01.03.23:** - Add php iconv.

readme-vars.yml

@@ -98,6 +98,7 @@ app_setup_block: |
   - **/config container path** => **BookStack relative path**
   - `/config/www/.env` => `.env`
   - `/config/www/laravel.log` => `storage/logs/laravel.log`
+  - `/config/www/backups/` => `storage/backups/`
   - `/config/www/files/` => `storage/uploads/files/`
   - `/config/www/images/` => `storage/uploads/images/`
   - `/config/www/themes/` => `themes/`
@@ -116,6 +117,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
   - { date: "01.03.23:", desc: "Add php iconv." }

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