From b3ed5f625f7c1cca17c69196e6aaad12d00baf46 Mon Sep 17 00:00:00 2001
From: Artemy Egorov <artegoser@gmail.com>
Date: Fri, 8 Dec 2023 06:34:35 +0300
Subject: [PATCH] Fix bookstack (#1036)

* Update bookstack.yml

* Update bookstack.yml
---
 public/v4/apps/bookstack.yml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/public/v4/apps/bookstack.yml b/public/v4/apps/bookstack.yml
index 095b56d..206b080 100644
--- a/public/v4/apps/bookstack.yml
+++ b/public/v4/apps/bookstack.yml
@@ -1,31 +1,30 @@
 captainVersion: 4
 services:
-    $$cap_appname-mariadb:
-        image: linuxserver/mariadb:110.4.14mariabionic-ls77
+    $$cap_appname-db:
+        image: lscr.io/linuxserver/mariadb:$$cap_mariadb_version
         environment:
-            MYSQL_ROOT_PASSWORD: $$cap_DB_PASS
-            MYSQL_DATABASE: bookstack
-            MYSQL_USER: bookstack
-            MYSQL_PASSWORD: $$cap_DB_PASS
             PGID: 1000
             PUID: 1000
+            MYSQL_ROOT_PASSWORD: $$cap_DB_PASS
             TZ: $$cap_timezone
+            MYSQL_DATABASE: bookstackapp
+            MYSQL_USER: bookstack
+            MYSQL_PASSWORD: $$cap_DB_PASS
         volumes:
-            - $$cap_appname-mariadb-config:/config
+            - $$cap_appname-db-config:/config
         caproverExtra:
             notExposeAsWebApp: 'true'
     $$cap_appname:
         environment:
-            DB_HOST: srv-captain--$$cap_appname-mariadb
+            PUID: 1000
+            PGID: 1000
+            APP_URL: http://$$cap_appname.$$cap_root_domain
+            DB_HOST: srv-captain--$$cap_appname-db
+            DB_PORT: 3306
             DB_USER: bookstack
             DB_PASS: $$cap_DB_PASS
-            DB_DATABASE: bookstack
-            DB_PORT: 3306
-            PGID: 1000
-            PUID: 1000
-            TZ: $$cap_timezone
-            APP_URL: http://$$cap_appname.$$cap_root_domain
-        image: linuxserver/bookstack:$$cap_bookstack_version
+            DB_DATABASE: bookstackapp
+        image: lscr.io/linuxserver/bookstack:$$cap_bookstack_version
         restart: always
         volumes:
             - $$cap_appname-config:/config
@@ -42,7 +41,11 @@ caproverOneClickApp:
         - id: $$cap_bookstack_version
           label: Version Tag
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/bookstack/tags
-          defaultValue: 'v0.29.3-ls99'
+          defaultValue: 'v23.10.4-ls118'
+        - id: $$cap_mariadb_version
+          label: MariaDB Version Tag
+          description: Check out their Docker page for the valid tags https://hub.docker.com/r/linuxserver/mariadb/tags
+          defaultValue: '10.11.5-r0-ls122'
     instructions:
         start: |-
             A platform to create documentation/wiki content built with PHP & Laravel.