fix remaining non-_dev stacks: bookstack, gitea, heimdall, invokeai, n8n, nextcloud, opencode, paperless, pihole, qbittorrent, stash

paperless/compose.yaml

@@ -1,82 +1,73 @@
-###############################################################################
-# Paperless-ngx
-# Modifed from: https://github.com/paperless-ngx/paperless-ngx/blob/main/docker/compose/docker-compose.mariadb-tika.yml
-###############################################################################
-
 services:
-
   paperless-broker:
-    image: docker.io/library/redis:8
-    restart: unless-stopped
+    image: ${REDIS_IMAGE:-redis:8}
+    restart: ${REDIS_RESTART:-unless-stopped}
     volumes:
-      - ${VOL_PATH:-/data}/paperless/redis:/data
+      - ${VOL_PATH}/paperless/redis:/data
     networks:
-      - paperless
+      - internal
 
   paperless-db:
-    image: docker.io/library/mariadb:12
-    restart: unless-stopped
+    image: ${MARIADB_IMAGE:-mariadb:latest}
+    restart: ${MARIADB_RESTART:-unless-stopped}
     volumes:
-      - ${VOL_PATH:-/data}/paperless/db:/var/lib/mysql
+      - ${VOL_PATH}/paperless/db:/var/lib/mysql
     environment:
-      MARIADB_HOST: ${PAPERLESS_MARIADB_HOST:-paperless-db}
-      MARIADB_DATABASE: ${PAPERLESS_MARIADB_DATABASE:-paperless}
-      MARIADB_USER: ${PAPERLESS_MARIADB_USER:-paperless}
-      MARIADB_PASSWORD: ${PAPERLESS_MARIADB_PASSWORD:-paperless}
-      MARIADB_ROOT_PASSWORD: ${PAPERLESS_MARIADB_ROOT_PASSWORD:-paperless}
+      - MARIADB_HOST=paperless-db
+      - MARIADB_DATABASE=${PAPERLESS_MARIADB_DATABASE:-paperless}
+      - MARIADB_USER=${PAPERLESS_MARIADB_USER:-paperless}
+      - MARIADB_PASSWORD=${PAPERLESS_MARIADB_PASSWORD:-paperless}
+      - MARIADB_ROOT_PASSWORD=${PAPERLESS_MARIADB_ROOT_PASSWORD:-paperless}
     networks:
-      - paperless
+      - internal
 
   paperless-webserver:
     image: ${PAPERLESS_IMAGE:-ghcr.io/paperless-ngx/paperless-ngx:latest}
-    restart: unless-stopped
+    restart: ${PAPERLESS_RESTART:-unless-stopped}
     volumes:
-      - ${VOL_PATH:-/data}/paperless/data:/usr/src/paperless/data
-      - ${VOL_PATH:-/data}/paperless/media:/usr/src/paperless/media
-      - ${VOL_PATH:-/data}/paperless/export:/usr/src/paperless/export
-      - ${VOL_PATH:-/data}/paperless/consume:/usr/src/paperless/consume
+      - ${VOL_PATH}/paperless/data:/usr/src/paperless/data
+      - ${VOL_PATH}/paperless/media:/usr/src/paperless/media
+      - ${VOL_PATH}/paperless/export:/usr/src/paperless/export
+      - ${VOL_PATH}/paperless/consume:/usr/src/paperless/consume
     environment:
-      PAPERLESS_REDIS: redis://paperless-broker:6379
-      PAPERLESS_DBENGINE: mariadb
-      PAPERLESS_DBHOST: paperless-db
-      PAPERLESS_DBUSER: ${PAPERLESS_MARIADB_USER:-paperless}
-      PAPERLESS_DBPASS: ${PAPERLESS_MARIADB_PASSWORD:-paperless}
-      PAPERLESS_DBPORT: 3306
-      PAPERLESS_TIKA_ENABLED: 1
-      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://paperless-gotenberg:3000
-      PAPERLESS_TIKA_ENDPOINT: http://paperless-tika:9998
-      PAPERLESS_TIME_ZONE: ${TZ:-America/Vancouver}
-      PAPERLESS_SECRET_KEY: ${PAPERLESS_SECRET_KEY:-changeme}
-      PAPERLESS_OCR_LANGUAGE: ${PAPERLESS_OCR_LANGUAGE:-eng}
-      PAPERLESS_URL: ${PAPERLESS_URL:-http://localhost}
-      PAPERLESS_CONSUMER_DELETE_DUPLICATES: ${PAPERLESS_CONSUMER_DELETE_DUPLICATES:-0}
-      PAPERLESS_CONSUMER_RECURSIVE: 1
+      - PAPERLESS_REDIS=redis://paperless-broker:6379
+      - PAPERLESS_DBENGINE=mariadb
+      - PAPERLESS_DBHOST=paperless-db
+      - PAPERLESS_DBUSER=${PAPERLESS_MARIADB_USER:-paperless}
+      - PAPERLESS_DBPASS=${PAPERLESS_MARIADB_PASSWORD:-paperless}
+      - PAPERLESS_DBPORT=3306
+      - PAPERLESS_TIKA_ENABLED=1
+      - PAPERLESS_TIKA_GOTENBERG_ENDPOINT=http://paperless-gotenberg:3000
+      - PAPERLESS_TIKA_ENDPOINT=http://paperless-tika:9998
+      - PAPERLESS_TIME_ZONE=${TZ:-America/Vancouver}
+      - PAPERLESS_SECRET_KEY=${PAPERLESS_SECRET_KEY:-changeme}
+      - PAPERLESS_OCR_LANGUAGE=${PAPERLESS_OCR_LANGUAGE:-eng}
+      - PAPERLESS_URL=${PAPERLESS_URL:-http://localhost}
+      - PAPERLESS_CONSUMER_DELETE_DUPLICATES=${PAPERLESS_CONSUMER_DELETE_DUPLICATES:-0}
+      - PAPERLESS_CONSUMER_RECURSIVE=1
     ports:
       - ${PAPERLESS_PORT:-8000}:8000
     networks:
-      - paperless
       - proxy
+      - internal
 
   paperless-gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.25
-    restart: unless-stopped
-    # The gotenberg chromium route is used to convert .eml files. We do not
-    # want to allow external content like tracking pixels or even javascript.
+    image: ${GOTENBERG_IMAGE:-gotenberg/gotenberg:8.25}
+    restart: ${GOTENBERG_RESTART:-unless-stopped}
     command:
-      - "gotenberg"
-      - "--chromium-disable-javascript=true"
-      - "--chromium-allow-list=file:///tmp/.*"
+      - gotenberg
+      - --chromium-disable-javascript=true
+      - --chromium-allow-list=file:///tmp/.*
     networks:
-      - paperless
+      - internal
 
   paperless-tika:
-    image: docker.io/apache/tika:latest
-    restart: unless-stopped
+    image: ${TIKA_IMAGE:-apache/tika:latest}
+    restart: ${TIKA_RESTART:-unless-stopped}
     networks:
-      - paperless
+      - internal
 
 networks:
   proxy:
     external: true
-  paperless:
-    driver: bridge
+  internal: