Migration to newer dockge/compose stack

ebook-reader/compose.yaml

@@ -1,46 +1,43 @@
-name: ebook-reader
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
 
 services:
   calibre:
-    hostname: calibre
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: calibre
     image: lscr.io/linuxserver/calibre
     environment:
       PUID: ${NASCOMPOSE_UID?}
       PGID: ${NASCOMPOSE_GID?}
     networks:
-      - reverse-proxy
       - calibre
     volumes:
-      - ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre_config/:/config/
+      - ./volumes/calibre_config/:/config/
       - ${NASCOMPOSE_DATA?}/media/ebooks/:/data/media/ebooks/
-      - ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre_database/metadata.db:/data/media/ebooks/metadata.db
-    restart: unless-stopped
+      - ./volumes/calibre_database/metadata.db:/data/media/ebooks/metadata.db
     labels:
-      traefik.enable: true
       traefik.http.services.calibre.loadbalancer.server.port: 8080
       traefik.http.routers.calibre.middlewares: authelia@file
-
   calibre-web:
-    hostname: calibre-web
+    extends:
+      file: ../compose.base.yaml
+      service: exposed-service
+    container_name: calibre-web
     image: lscr.io/linuxserver/calibre-web
     environment:
       PUID: ${NASCOMPOSE_UID?}
       PGID: ${NASCOMPOSE_GID?}
     networks:
-      - reverse-proxy
       - calibre
     volumes:
-      - ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre-web_config/:/config/
+      - ./volumes/calibre-web_config/:/config/
       - ${NASCOMPOSE_DATA?}/media/ebooks/:/data/media/ebooks/:ro
-      - ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre_database/metadata.db:/data/media/ebooks/metadata.db:ro
-    restart: unless-stopped
+      - ./volumes/calibre_database/metadata.db:/data/media/ebooks/metadata.db:ro
     labels:
-      traefik.enable: true
       traefik.http.routers.calibre-web.middlewares: authelia@file
-
 networks:
   calibre:
     name: calibre
-
   reverse-proxy:
     external: true