From 9c0bc042ff699a811e99759e430d5ebc22390216 Mon Sep 17 00:00:00 2001
From: Ricky Wanga <dev@rickywanga.com>
Date: Mon, 23 Mar 2026 12:55:25 +0100
Subject: [PATCH 1/3] feat: add grimmory service and database configuration to
 compose template

---
 public/svgs/grimmory.svg        |  4 +++
 templates/compose/grimmory.yaml | 49 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 public/svgs/grimmory.svg
 create mode 100644 templates/compose/grimmory.yaml

diff --git a/public/svgs/grimmory.svg b/public/svgs/grimmory.svg
new file mode 100644
index 000000000..cd8230fa2
--- /dev/null
+++ b/public/svgs/grimmory.svg
@@ -0,0 +1,4 @@
+<svg width="126" height="126" viewBox="0 0 126 126" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M59 4.79297C71.5051 11.5557 80 24.7854 80 40C80 40.5959 79.987 41.1888 79.9609 41.7783C79.8609 44.0406 81.7355 46 84 46C106.091 46 124 63.9086 124 86C124 108.091 106.091 126 84 126H10C4.47715 126 0 121.523 0 116V39.0068L0.0126953 38.9941C0.357624 25.0252 7.86506 12.8347 19 5.95215V63.832C19 64.8345 20.0676 65.4391 20.9121 64.9902L21.0771 64.8867L38.2227 52.3428C38.6819 52.0068 39.3064 52.0068 39.7656 52.3428L56.9229 64.8945L57.0879 64.998C57.9324 65.447 59 64.8423 59 63.8398V4.79297Z" fill="#818cf8"/>
+<path d="M40 0C43.8745 0 47.6199 0.552381 51.1631 1.58008V50.9697L44.3926 46.0176L44.0879 45.8037C40.9061 43.6679 36.7098 43.7393 33.5957 46.0176L26.8369 50.9619V2.21875C30.9593 0.782634 35.3881 0 40 0Z" fill="white"/>
+</svg>
diff --git a/templates/compose/grimmory.yaml b/templates/compose/grimmory.yaml
new file mode 100644
index 000000000..aae7c785e
--- /dev/null
+++ b/templates/compose/grimmory.yaml
@@ -0,0 +1,49 @@
+# documentation: https://github.com/grimmory-tools/grimmory
+# slogan: Grimmory is a self-hosted application for managing your entire book collection in one place. Organize, read, annotate, sync across devices, and share without relying on third-party services.
+# tags: books,ebooks,library,reader
+# logo: svgs/grimmory.svg
+# port: 80
+
+services:
+  grimmory:
+    image: 'grimmory/grimmory:latest'
+    environment:
+      - SERVICE_URL_GRIMMORY_80
+      - 'USER_ID=${GRIMMORY_USER_ID:-0}'
+      - 'GROUP_ID=${GRIMMORY_GROUP_ID:-0}'
+      - 'TZ=${TZ:-UTC}'
+      - 'DATABASE_URL=jdbc:mariadb://mariadb:3306/${MARIADB_DATABASE:-grimmory-db}'
+      - 'DATABASE_USERNAME=${SERVICE_USER_MARIADB}'
+      - 'DATABASE_PASSWORD=${SERVICE_PASSWORD_MARIADB}'
+      - BOOKLORE_PORT=80
+    volumes:
+      - 'grimmory-data:/app/data'
+      - 'grimmory-books:/books'
+      - 'grimmory-bookdrop:/bookdrop'
+    healthcheck:
+      test: 'wget --no-verbose --tries=1 --spider http://localhost/login || exit 1'
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    depends_on:
+      mariadb:
+        condition: service_healthy
+
+  mariadb:
+    image: 'mariadb:12'
+    environment:
+      - 'MARIADB_USER=${SERVICE_USER_MARIADB}'
+      - 'MARIADB_PASSWORD=${SERVICE_PASSWORD_MARIADB}'
+      - 'MARIADB_ROOT_PASSWORD=${SERVICE_PASSWORD_MARIADBROOT}'
+      - 'MARIADB_DATABASE=${MARIADB_DATABASE:-grimmory-db}'
+    volumes:
+      - 'mariadb-data:/var/lib/mysql'
+    healthcheck:
+      test:
+        - CMD
+        - healthcheck.sh
+        - '--connect'
+        - '--innodb_initialized'
+      interval: 10s
+      timeout: 5s
+      retries: 10
\ No newline at end of file

From 5297aaa00356ac5d0f0150247ae3a11558526de2 Mon Sep 17 00:00:00 2001
From: ShadowArcanist <162910371+ShadowArcanist@users.noreply.github.com>
Date: Fri, 3 Apr 2026 18:59:09 +0530
Subject: [PATCH 2/3] pin grimmory service to static version

---
 templates/compose/grimmory.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/compose/grimmory.yaml b/templates/compose/grimmory.yaml
index aae7c785e..da0628ea6 100644
--- a/templates/compose/grimmory.yaml
+++ b/templates/compose/grimmory.yaml
@@ -6,7 +6,7 @@
 
 services:
   grimmory:
-    image: 'grimmory/grimmory:latest'
+    image: 'grimmory/grimmory:nightly-20260403-3a371f7' # Released on April 3 2026
     environment:
       - SERVICE_URL_GRIMMORY_80
       - 'USER_ID=${GRIMMORY_USER_ID:-0}'

From 7e31c6d83a384bffce5bbd07b4a5dade699c497b Mon Sep 17 00:00:00 2001
From: ShadowArcanist <162910371+ShadowArcanist@users.noreply.github.com>
Date: Fri, 3 Apr 2026 18:59:26 +0530
Subject: [PATCH 3/3] fix healthcheck path for grimmory service

---
 templates/compose/grimmory.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/compose/grimmory.yaml b/templates/compose/grimmory.yaml
index da0628ea6..c04d1086d 100644
--- a/templates/compose/grimmory.yaml
+++ b/templates/compose/grimmory.yaml
@@ -21,7 +21,7 @@ services:
       - 'grimmory-books:/books'
       - 'grimmory-bookdrop:/bookdrop'
     healthcheck:
-      test: 'wget --no-verbose --tries=1 --spider http://localhost/login || exit 1'
+      test: 'wget --no-verbose --tries=1 --spider http://127.0.0.1/health || exit 1'
       interval: 10s
       timeout: 5s
       retries: 10