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

This commit is contained in:
2024-11-16 00:04:49 +11:00
parent c615a4af25
commit 3ca2f07ddc

View File

@@ -191,7 +191,8 @@ services:
- "587:587" - "587:587"
- "993:993" - "993:993"
labels: 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.enable=true"
- "traefik.http.routers.mail.rule=Host(`rspamd.ddp.net`)" - "traefik.http.routers.mail.rule=Host(`rspamd.ddp.net`)"
- "traefik.http.services.mail.loadbalancer.server.port=11334" - "traefik.http.services.mail.loadbalancer.server.port=11334"
@@ -625,14 +626,14 @@ services:
context: '/home/ddp/src/pybook' context: '/home/ddp/src/pybook'
args: args:
ENV: "container" ENV: "container"
USERID: "2000" BOOK_UID: "1000"
GROUPID: "2000" BOOK_GID: "1000"
user: "2000:2000"
depends_on: depends_on:
- bookdb_dev - bookdb_dev
- pihole - pihole
volumes: volumes:
- /home/ddp/src/pybook/:/pybook_mapped_volume - /home/ddp/src/pybook/:/pybook_mapped_volume
- /export/docker/storage/books/:/books
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
labels: labels:
- "com.centurylinklabs.watchtower.enable=false" - "com.centurylinklabs.watchtower.enable=false"
@@ -644,14 +645,19 @@ services:
container_name: book container_name: book
restart: always restart: always
environment: environment:
FLASK_ENV: "production" FLASK_ENV: "production"
build: build:
context: '/home/ddp/src/pybook' context: '/home/ddp/src/pybook'
args:
ENV: "production"
BOOK_UID: "1000"
BOOK_GID: "1000"
depends_on: depends_on:
- bookdb - bookdb
- pihole - pihole
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /export/docker/storage/books:/books
- /etc/localtime:/etc/localtime:ro
labels: labels:
- "com.centurylinklabs.watchtower.enable=false" - "com.centurylinklabs.watchtower.enable=false"
- "traefik.enable=true" - "traefik.enable=true"
@@ -684,6 +690,11 @@ services:
- /srv/docker/container/padb_dev/mara-init:/root/mara-init - /srv/docker/container/padb_dev/mara-init:/root/mara-init
- /srv/docker/container/padb_dev/mara-bin:/root/mara-bin - /srv/docker/container/padb_dev/mara-bin:/root/mara-bin
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
healthcheck:
test: ["CMD", "pg_isready", "-U", "pa"]
interval: 30s
timeout: 10s
retries: 5
padb: padb:
container_name: padb container_name: padb
@@ -719,7 +730,8 @@ services:
environment: environment:
ENV: "container" ENV: "container"
depends_on: depends_on:
- padb_dev padb_dev:
condition: service_healthy
volumes: volumes:
- /home/ddp/src/photoassistant:/home/ddp/src/photoassistant - /home/ddp/src/photoassistant:/home/ddp/src/photoassistant
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro