Migration to newer dockge/compose stack

document-collector/compose.yaml

@@ -1,11 +1,14 @@
-name: document-collector
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
 
 services:
   paperless:
-    hostname: paperless
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: paperless
     image: ghcr.io/paperless-ngx/paperless-ngx
     environment:
-      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_REDIS: redis://paperless-broker:6379
       USERMAP_UID: ${NASCOMPOSE_UID?}
       USERMAP_GID: ${NASCOMPOSE_GID?}
       PAPERLESS_URL: https://paperless.${NASCOMPOSE_DOMAIN?}
@@ -13,27 +16,24 @@ services:
       PAPERLESS_TRASH_DIR: /usr/src/paperless/media/recycle-bin/paperless/
       PAPERLESS_OCR_USER_ARGS: '{"invalidate_digital_signatures": true}'
     networks:
-      - reverse-proxy
       - default
     depends_on:
-      - broker
+      - paperless-broker
     volumes:
-      - ${NASCOMPOSE_SERVICES?}/document-collector/volumes/paperless_data/:/usr/src/paperless/data/
+      - ./volumes/paperless_data/:/usr/src/paperless/data/
       - ${NASCOMPOSE_DATA?}/media/:/usr/src/paperless/media/
       - ${NASCOMPOSE_DATA?}/consume:/usr/src/paperless/consume
       - ${NASCOMPOSE_DATA?}/export:/usr/src/paperless/export
-    restart: unless-stopped
     labels:
-      traefik.enable: true
       traefik.http.routers.paperless.middlewares: authelia@file
-
-  broker:
-    hostname: broker
-    image: redis:7
+  paperless-broker:
+    extends:
+      file: ../compose.base.yaml
+      service: base-service
+    container_name: paperless-broker
+    image: redis
     volumes:
-      - ${NASCOMPOSE_SERVICES?}/document-collector/volumes/broker_data/:/data/
-    restart: unless-stopped
-
+      - ./volumes/broker_data/:/data/
 networks:
   reverse-proxy:
     external: true