diff --git a/services/book-collector/docker-compose.yml b/services/book-collector/docker-compose.yml index 32b1101..f64ed2a 100644 --- a/services/book-collector/docker-compose.yml +++ b/services/book-collector/docker-compose.yml @@ -13,8 +13,8 @@ services: - torrents - usenet volumes: - - readarr-audiobook_config:/config/ - - data:/data/ + - ${NASCOMPOSE_SERVICES?}/book-collector/volumes/readarr-audiobook_config/:/config/ + - ${NASCOMPOSE_DATA?}/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -32,8 +32,8 @@ services: - torrents - usenet volumes: - - readarr-ebook_config:/config/ - - data:/data/ + - ${NASCOMPOSE_SERVICES?}/book-collector/volumes/readarr-ebook_config/:/config/ + - ${NASCOMPOSE_DATA?}/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -46,21 +46,3 @@ networks: external: true usenet: external: true - -volumes: - data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?} - - readarr-audiobook_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/book-collector/volumes/readarr-audiobook_config/ - readarr-ebook_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/book-collector/volumes/readarr-ebook_config/ diff --git a/services/bootstrap/docker-compose.yml b/services/bootstrap/docker-compose.yml index b909879..30fc0f0 100644 --- a/services/bootstrap/docker-compose.yml +++ b/services/bootstrap/docker-compose.yml @@ -24,7 +24,7 @@ services: networks: - docker volumes: - - portainer_data:/data/ + - ${NASCOMPOSE_SERVICES?}/bootstrap/volumes/portainer_data/:/data/ secrets: - portainer_password depends_on: @@ -39,15 +39,6 @@ networks: labels: nas-compose.boostrap: true -volumes: - portainer_data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/bootstrap/volumes/portainer_data/ - labels: - nas-compose.boostrap: true - secrets: portainer_password: file: ${NASCOMPOSE_SERVICES?}/bootstrap/secrets/portainer_password diff --git a/services/comic-collector/docker-compose.yml b/services/comic-collector/docker-compose.yml index c97440f..981e577 100644 --- a/services/comic-collector/docker-compose.yml +++ b/services/comic-collector/docker-compose.yml @@ -13,8 +13,8 @@ services: - torrents - usenet volumes: - - mylar_config:/config/ - - data:/data/ + - ${NASCOMPOSE_SERVICES?}/comic-collector/volumes/mylar_config/:/config/ + - ${NASCOMPOSE_DATA?}/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -27,16 +27,3 @@ networks: external: true usenet: external: true - -volumes: - data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?} - - mylar_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/comic-collector/volumes/mylar_config/ diff --git a/services/ebook-reader/docker-compose.yml b/services/ebook-reader/docker-compose.yml index f0d4814..00fa84e 100644 --- a/services/ebook-reader/docker-compose.yml +++ b/services/ebook-reader/docker-compose.yml @@ -11,8 +11,8 @@ services: - reverse-proxy - calibre volumes: - - calibre_config:/config - - ebooks:/ebooks + - ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre_config/:/config/ + - ${NASCOMPOSE_DATA?}/media/ebooks/:/ebooks/ restart: unless-stopped labels: traefik.enable: true @@ -29,8 +29,8 @@ services: - reverse-proxy - calibre volumes: - - calibre-web_config:/config - - ebooks:/ebooks + - ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre-web_config/:/config/ + - ${NASCOMPOSE_DATA?}/media/ebooks/:/ebooks/ restart: unless-stopped labels: traefik.enable: true @@ -41,21 +41,3 @@ networks: reverse-proxy: external: true - -volumes: - ebooks: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/media/ebooks/ - - calibre_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre_config/ - calibre-web_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/ebook-reader/volumes/calibre-web_config/ diff --git a/services/indexer/docker-compose.yml b/services/indexer/docker-compose.yml index 14a84d0..92175c1 100644 --- a/services/indexer/docker-compose.yml +++ b/services/indexer/docker-compose.yml @@ -18,7 +18,7 @@ services: - 1.1.1.1 - 1.0.0.1 volumes: - - prowlarr_config:/config/ + - ${NASCOMPOSE_SERVICES?}/indexer/volumes/prowlarr_config/:/config/ restart: unless-stopped labels: traefik.enable: true @@ -39,10 +39,3 @@ networks: external: true usenet: external: true - -volumes: - prowlarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/indexer/volumes/prowlarr_config/ diff --git a/services/media-player/docker-compose.yml b/services/media-player/docker-compose.yml index 04643c7..d3a5060 100644 --- a/services/media-player/docker-compose.yml +++ b/services/media-player/docker-compose.yml @@ -13,9 +13,9 @@ services: - scrobbler volumes: - plex_transcode:/transcode/ - - plex_config:/config/ - - tv:/data/tv/ - - movies:/data/movies/ + - ${NASCOMPOSE_SERVICES?}/media-player/volumes/plex_config/:/config/ + - ${NASCOMPOSE_DATA?}/media/tv/:/data/tv/:ro + - ${NASCOMPOSE_DATA?}/media/movies/:/data/movies/:ro restart: unless-stopped labels: traefik.enable: true @@ -32,9 +32,9 @@ services: networks: - reverse-proxy volumes: - - audiobookshelf_config:/config/ - - audiobookshelf_metadata:/metadata/ - - audiobooks:/audiobooks/ + - ${NASCOMPOSE_SERVICES?}/media-player/volumes/audiobookshelf_config/:/config/ + - ${NASCOMPOSE_SERVICES?}/media-player/volumes/audiobookshelf_metadata/:/metadata/ + - ${NASCOMPOSE_DATA?}/media/audiobooks/:/audiobooks/ restart: unless-stopped labels: traefik.enable: true @@ -50,38 +50,4 @@ networks: external: true volumes: - movies: - name: movies - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/media/movies/ - tv: - name: tv - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/media/tv/ - audiobooks: - name: audiobooks - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/media/audiobooks/ - plex_transcode: - plex_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/media-player/volumes/plex_config/ - audiobookshelf_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/media-player/volumes/audiobookshelf_config/ - audiobookshelf_metadata: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/media-player/volumes/audiobookshelf_metadata/ diff --git a/services/media-requester/docker-compose.yml b/services/media-requester/docker-compose.yml index a3ab7cc..7492216 100644 --- a/services/media-requester/docker-compose.yml +++ b/services/media-requester/docker-compose.yml @@ -13,7 +13,7 @@ services: - tv-collector - movie-collector volumes: - - ombi_config:/config/ + - ${NASCOMPOSE_SERVICES?}/media-requester/volumes/ombi_config/:/config/ restart: unless-stopped labels: traefik.enable: true @@ -27,10 +27,3 @@ networks: external: true media-player: external: true - -volumes: - ombi_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/media-requester/volumes/ombi_config/ diff --git a/services/movie-collector/docker-compose.yml b/services/movie-collector/docker-compose.yml index ae1f583..23d6bf2 100644 --- a/services/movie-collector/docker-compose.yml +++ b/services/movie-collector/docker-compose.yml @@ -13,8 +13,8 @@ services: - torrents - usenet volumes: - - radarr_config:/config/ - - data:/data/ + - ${NASCOMPOSE_SERVICES?}/movie-collector/volumes/radarr_config/:/config/ + - ${NASCOMPOSE_DATA?}/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -30,16 +30,3 @@ networks: external: true usenet: external: true - -volumes: - data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?} - - radarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/movie-collector/volumes/radarr_config/ diff --git a/services/network-monitoring/docker-compose.yml b/services/network-monitoring/docker-compose.yml index 2d1d8ca..89703c5 100644 --- a/services/network-monitoring/docker-compose.yml +++ b/services/network-monitoring/docker-compose.yml @@ -10,8 +10,8 @@ services: networks: - reverse-proxy volumes: - - smokeping_config:/config/ - - smokeping_data:/data/ + - ${NASCOMPOSE_SERVICES?}/network-monitoring/volumes/smokeping_config/:/config/ + - ${NASCOMPOSE_SERVICES?}/network-monitoring/volumes/smokeping_data/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -20,15 +20,3 @@ services: networks: reverse-proxy: external: true - -volumes: - smokeping_data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/network-monitoring/volumes/smokeping_data/ - smokeping_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/network-monitoring/volumes/smokeping_config/ diff --git a/services/notifiarr/docker-compose.yml b/services/notifiarr/docker-compose.yml index 95c17f2..6e31c40 100644 --- a/services/notifiarr/docker-compose.yml +++ b/services/notifiarr/docker-compose.yml @@ -11,7 +11,7 @@ services: networks: - reverse-proxy volumes: - - notifiarr_config:/config/ + - ${NASCOMPOSE_SERVICES?}/notifiarr/volumes/notifiarr_config/:/config/ restart: unless-stopped labels: traefik.enable: true @@ -20,10 +20,3 @@ services: networks: reverse-proxy: external: true - -volumes: - notifiarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/notifiarr/volumes/notifiarr_config/ diff --git a/services/portal/docker-compose.yml b/services/portal/docker-compose.yml index 48bc59c..ae65e81 100644 --- a/services/portal/docker-compose.yml +++ b/services/portal/docker-compose.yml @@ -10,7 +10,7 @@ services: networks: - reverse-proxy volumes: - - heimdall_config:/config/ + - ${NASCOMPOSE_SERVICES?}/portal/volumes/heimdall_config/:/config/ restart: unless-stopped labels: traefik.enable: true @@ -19,10 +19,3 @@ services: networks: reverse-proxy: external: true - -volumes: - heimdall_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/portal/volumes/heimdall_config/ diff --git a/services/scrobbler/docker-compose.yml b/services/scrobbler/docker-compose.yml index 2acadee..11e40af 100644 --- a/services/scrobbler/docker-compose.yml +++ b/services/scrobbler/docker-compose.yml @@ -19,7 +19,7 @@ services: - reverse-proxy - scrobbler volumes: - - plaxt_keystore:/app/keystore/ + - ${NASCOMPOSE_SERVICES?}/scrobbler/volumes/plaxt_keystore/:/app/keystore/ secrets: - trakt_id - trakt_secret @@ -35,13 +35,6 @@ networks: reverse-proxy: external: true -volumes: - plaxt_keystore: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/scrobbler/volumes/plaxt_keystore/ - secrets: trakt_id: file: ${NASCOMPOSE_SERVICES?}/scrobbler/secrets/trakt_id diff --git a/services/torrents/docker-compose.yml b/services/torrents/docker-compose.yml index 8e87c06..7be5ee1 100644 --- a/services/torrents/docker-compose.yml +++ b/services/torrents/docker-compose.yml @@ -21,8 +21,8 @@ services: - 1.1.1.1 - 1.0.0.1 volumes: - - transmission_config:/config/ - - torrents:/data/ + - ${NASCOMPOSE_SERVICES?}/torrents/volumes/transmission_config/:/config/ + - ${NASCOMPOSE_DATA?}/torrents/:/data/ secrets: - source: transmission_vpn_creds target: openvpn_creds @@ -39,19 +39,6 @@ networks: reverse-proxy: external: true -volumes: - torrents: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/torrents/ - - transmission_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/torrents/volumes/transmission_config/ - secrets: transmission_vpn_creds: file: ${NASCOMPOSE_SERVICES?}/torrents/secrets/vpn_creds diff --git a/services/tv-collector/docker-compose.yml b/services/tv-collector/docker-compose.yml index 240dec4..bbb44fa 100644 --- a/services/tv-collector/docker-compose.yml +++ b/services/tv-collector/docker-compose.yml @@ -13,8 +13,8 @@ services: - torrents - usenet volumes: - - sonarr_config:/config/ - - data:/data/ + - ${NASCOMPOSE_SERVICES?}/tv-collector/volumes/sonarr_config/:/config/ + - ${NASCOMPOSE_DATA?}/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -32,16 +32,3 @@ networks: external: true media-player: external: true - -volumes: - data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?} - - sonarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/tv-collector/volumes/sonarr_config/ \ No newline at end of file diff --git a/services/usenet/docker-compose.yml b/services/usenet/docker-compose.yml index 730beb9..3ca5479 100644 --- a/services/usenet/docker-compose.yml +++ b/services/usenet/docker-compose.yml @@ -18,8 +18,8 @@ services: - reverse-proxy - usenet volumes: - - sabnzbd_config:/config/ - - usenet:/data/ + - ${NASCOMPOSE_SERVICES?}/usenet/volumes/sabnzbd_config/:/config/ + - ${NASCOMPOSE_DATA?}/usenet/:/data/ restart: unless-stopped labels: traefik.enable: true @@ -31,16 +31,3 @@ networks: reverse-proxy: external: true - -volumes: - usenet: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/usenet/ - - sabnzbd_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/usenet/volumes/sabnzbd_config/ diff --git a/services/youtube-dl/docker-compose.yml b/services/youtube-dl/docker-compose.yml index 2f8eef6..c5d525f 100644 --- a/services/youtube-dl/docker-compose.yml +++ b/services/youtube-dl/docker-compose.yml @@ -20,7 +20,7 @@ services: networks: - reverse-proxy volumes: - - youtube-dl:/downloads + - ${NASCOMPOSE_DATA?}/ytdl/:/downloads/ restart: unless-stopped labels: traefik.enable: true @@ -29,10 +29,3 @@ services: networks: reverse-proxy: external: true - -volumes: - youtube-dl: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?}/youtube-dl/