From 3ca2f07ddc751d524bdc3931fbc0d09793a7c791 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sat, 16 Nov 2024 00:04:49 +1100
Subject: [PATCH] moving to BOOK_UID/BOOK_GID args for pybook, mount in /books
 so we can write ebooks to it, and try harder to stop watchtower restarting
 mail container

---
 docker-compose.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5b3ec36..aae6e5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -191,7 +191,8 @@ services:
       - "587:587"
       - "993:993"
     labels:
-      - "com.centurylinklabs.watchtower.enable=true"
+      # somehow watchtower keeps restarting mail even without an update AND the mailserver emails me with updates anyway
+      - "com.centurylinklabs.watchtower.enable=false"
       - "traefik.enable=true"
       - "traefik.http.routers.mail.rule=Host(`rspamd.ddp.net`)"
       - "traefik.http.services.mail.loadbalancer.server.port=11334"
@@ -625,14 +626,14 @@ services:
       context: '/home/ddp/src/pybook'
       args:
         ENV: "container"
-        USERID: "2000"
-        GROUPID: "2000"
-    user: "2000:2000"
+        BOOK_UID: "1000"
+        BOOK_GID: "1000"
     depends_on:
       - bookdb_dev
       - pihole
     volumes:
       - /home/ddp/src/pybook/:/pybook_mapped_volume
+      - /export/docker/storage/books/:/books
       - /etc/localtime:/etc/localtime:ro
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
@@ -644,14 +645,19 @@ services:
     container_name: book
     restart: always
     environment:
-        FLASK_ENV: "production"
+      FLASK_ENV: "production"
     build: 
       context: '/home/ddp/src/pybook'
+      args:
+        ENV: "production"
+        BOOK_UID: "1000"
+        BOOK_GID: "1000"
     depends_on:
       - bookdb
       - pihole
     volumes:
-     - /etc/localtime:/etc/localtime:ro
+      - /export/docker/storage/books:/books
+      - /etc/localtime:/etc/localtime:ro
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
       - "traefik.enable=true"
@@ -684,6 +690,11 @@ services:
       - /srv/docker/container/padb_dev/mara-init:/root/mara-init
       - /srv/docker/container/padb_dev/mara-bin:/root/mara-bin
       - /etc/localtime:/etc/localtime:ro
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "pa"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
 
   padb:
     container_name: padb
@@ -719,7 +730,8 @@ services:
     environment:
       ENV: "container"
     depends_on:
-      - padb_dev
+      padb_dev:
+        condition: service_healthy
     volumes:
       - /home/ddp/src/photoassistant:/home/ddp/src/photoassistant
       - /etc/localtime:/etc/localtime:ro