From c2bf5cc4433b56e2794964a37e1ba21ed26948a4 Mon Sep 17 00:00:00 2001
From: poslop <bcb@airmail.cc>
Date: Fri, 11 Oct 2024 11:58:24 -0500
Subject: [PATCH] bookstack

---
 .../Bookstack/bookstack-stack.yml             | 58 +++++++++++
 .../Shared/docker-compose.networks.yml        | 13 +++
 docker-compose.yml                            | 95 +++++++++----------
 3 files changed, 116 insertions(+), 50 deletions(-)
 create mode 100644 docker-compose.d/Bookstack/bookstack-stack.yml
 create mode 100644 docker-compose.d/Shared/docker-compose.networks.yml

diff --git a/docker-compose.d/Bookstack/bookstack-stack.yml b/docker-compose.d/Bookstack/bookstack-stack.yml
new file mode 100644
index 0000000..2858b3f
--- /dev/null
+++ b/docker-compose.d/Bookstack/bookstack-stack.yml
@@ -0,0 +1,58 @@
+services:
+  bookstack:
+    image: lscr.io/linuxserver/bookstack
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Chicago
+      - APP_URL=https://bookstack.mintyserver.net
+      - DB_HOST=bookstack_db
+      - DB_PORT=3306
+      - DB_USER=bookstack
+      - DB_PASS=/run/secrets/PASS
+      - DB_DATABASE=bookstackapp
+    volumes:
+      - bookstack:/config
+    depends_on:
+      - bookstack_db
+    ports:
+      - 8989:80
+    secrets:
+      - PASS
+    networks:
+      - caddy
+      - bookstack
+
+  bookstack_db:
+    image: lscr.io/linuxserver/mariadb
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Chicago
+      - MYSQL_ROOT_PASSWORD=/run/secrets/PASS
+      - MYSQL_DATABASE=bookstackapp
+      - MYSQL_USER=bookstack
+      - MYSQL_PASSWORD=/run/secrets/PASS
+    volumes:
+      - bookstack_db:/config
+    secrets:
+      - PASS
+    networks:
+      - bookstack
+
+networks:
+  caddy:
+    name: caddy
+    external: true
+  bookstack:
+    name: bookstack
+
+volumes:
+  bookstack:
+    name: bookstack
+  bookstack_db:
+    name: bookstack_db
+
+secrets:
+  PASS:
+    external: true
diff --git a/docker-compose.d/Shared/docker-compose.networks.yml b/docker-compose.d/Shared/docker-compose.networks.yml
new file mode 100644
index 0000000..422fdfd
--- /dev/null
+++ b/docker-compose.d/Shared/docker-compose.networks.yml
@@ -0,0 +1,13 @@
+
+networks:
+  caddy:
+    name: caddy
+  qbit:
+    name: qbit
+  shoko:
+    name: shoko
+  arr:
+    name: arr
+  bookstack:
+    name: bookstack
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 99b7104..7919acc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,15 @@
 networks:
   caddy:
     name: caddy
+    external: true
   qbit:
     name: qbit
   shoko:
     name: shoko
   arr:
     name: arr
-  bookstack:
-    name: bookstack
+    #bookstack:
+    #name: bookstack
 
 services:
   anki:
@@ -25,52 +26,46 @@ services:
     networks:
       - caddy
 
-  bookstack:
-    image: lscr.io/linuxserver/bookstack
-    container_name: bookstack
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Chicago
-      - APP_URL=https://bookstack.mintyserver.net
-      - DB_HOST=bookstack_db
-      - DB_PORT=3306
-      - DB_USER=bookstack
-      - DB_PASS=${PASS}
-      - DB_DATABASE=bookstackapp
-    volumes:
-      - bookstack:/config
-    restart: unless-stopped
-    depends_on:
-      - bookstack_db
-    networks:
-      - caddy
-      - bookstack
-  
-  bookstack_db:
-    image: lscr.io/linuxserver/mariadb
-    container_name: bookstack_db
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Chicago
-      - MYSQL_ROOT_PASSWORD=${PASS}
-      - MYSQL_DATABASE=bookstackapp
-      - MYSQL_USER=bookstack
-      - MYSQL_PASSWORD=${PASS}
-    volumes:
-      - bookstack_db:/config
-    restart: unless-stopped
-    networks:
-      - bookstack
+      #bookstack:
+      #  image: lscr.io/linuxserver/bookstack
+      #  container_name: bookstack
+      #  environment:
+      #    - PUID=1000
+      #    - PGID=1000
+      #    - TZ=America/Chicago
+      #    - APP_URL=https://bookstack.mintyserver.net
+      #    - DB_HOST=bookstack_db
+      #    - DB_PORT=3306
+      #    - DB_USER=bookstack
+      #    - DB_PASS=${PASS}
+      #    - DB_DATABASE=bookstackapp
+      #  volumes:
+      #    - bookstack:/config
+      #  restart: unless-stopped
+      #  depends_on:
+      #    - bookstack_db
+      #  networks:
+      #    - caddy
+      #    - bookstack
+      #
+      #bookstack_db:
+      #  image: lscr.io/linuxserver/mariadb
+      #  container_name: bookstack_db
+      #  environment:
+      #    - PUID=1000
+      #    - PGID=1000
+      #    - TZ=America/Chicago
+      #    - MYSQL_ROOT_PASSWORD=${PASS}
+      #    - MYSQL_DATABASE=bookstackapp
+      #    - MYSQL_USER=bookstack
+      #    - MYSQL_PASSWORD=${PASS}
+      #  volumes:
+      #    - bookstack_db:/config
+      #  restart: unless-stopped
+      #  networks:
+      #    - bookstack
 
 
-  maigret:
-    image: soxoj/maigret:latest
-    container_name: maigret
-    volumes:
-      - /mnt/nextcloud/poslop/Maigret:/app/reports
-
   gluetun:
     image: ghcr.io/qdm12/gluetun
     cap_add:
@@ -393,7 +388,7 @@ volumes:
     name: p2pool-data
   gluetun:
     name: gluetun
-  bookstack:
-    name: bookstack
-  bookstack_db:
-    name: booksstack_db
+    # bookstack:
+    #   name: bookstack
+    # bookstack_db:
+    #   name: bookstack_db