From 777d121d6041db92320eb0de14f1e85dd49e264d Mon Sep 17 00:00:00 2001 From: Colin Hebert Date: Sat, 21 Jan 2023 12:27:30 +0100 Subject: [PATCH] Move collectors in respective services --- collectors.docker-compose.yml | 119 +----------------- services/book-collector/docker-compose.yml | 41 ++++++ .../volumes/lazylibrarian_config}/.gitkeep | 0 services/comic-collector/docker-compose.yml | 41 ++++++ .../volumes/mylar_config}/.gitkeep | 0 services/movie-collector/docker-compose.yml | 43 +++++++ .../volumes/radarr_config}/.gitkeep | 0 .../subtitle-collector/docker-compose.yml | 41 ++++++ .../volumes/bazarr_config}/.gitkeep | 0 services/tv-collector/docker-compose.yml | 45 +++++++ .../volumes/sonarr_config}/.gitkeep | 0 11 files changed, 215 insertions(+), 115 deletions(-) create mode 100644 services/book-collector/docker-compose.yml rename {docker/volumes/bazarr/config => services/book-collector/volumes/lazylibrarian_config}/.gitkeep (100%) create mode 100644 services/comic-collector/docker-compose.yml rename {docker/volumes/lazylibrarian/config => services/comic-collector/volumes/mylar_config}/.gitkeep (100%) create mode 100644 services/movie-collector/docker-compose.yml rename {docker/volumes/mylar/config => services/movie-collector/volumes/radarr_config}/.gitkeep (100%) create mode 100644 services/subtitle-collector/docker-compose.yml rename {docker/volumes/radarr/config => services/subtitle-collector/volumes/bazarr_config}/.gitkeep (100%) create mode 100644 services/tv-collector/docker-compose.yml rename {docker/volumes/sonarr/config => services/tv-collector/volumes/sonarr_config}/.gitkeep (100%) diff --git a/collectors.docker-compose.yml b/collectors.docker-compose.yml index 191599a..05fd666 100644 --- a/collectors.docker-compose.yml +++ b/collectors.docker-compose.yml @@ -1,87 +1,6 @@ name: Collectors services: - mylar: - image: linuxserver/mylar3 - profiles: [ebooks] - environment: - PUID: ${NASCOMPOSE_UID?} - PGID: ${NASCOMPOSE_GID?} - networks: - - reverse-proxy - volumes: - - mylar_config:/config/ - - data:/data - restart: unless-stopped - labels: - traefik.enable: true - traefik.http.routers.mylar.middlewares: authelia@file - - lazylibrarian: - image: linuxserver/lazylibrarian - profiles: [ebooks] - environment: - PUID: ${NASCOMPOSE_UID?} - PGID: ${NASCOMPOSE_GID?} - networks: - - reverse-proxy - volumes: - - lazylibrarian_config:/config/ - - data:/data - restart: unless-stopped - labels: - traefik.enable: true - traefik.http.routers.lazylibrarian.middlewares: authelia@file - - sonarr: - image: linuxserver/sonarr - environment: - PUID: ${NASCOMPOSE_UID?} - PGID: ${NASCOMPOSE_GID?} - networks: - - reverse-proxy - - torrents - - usenet - volumes: - - sonarr_config:/config/ - - data:/data - restart: unless-stopped - labels: - traefik.enable: true - traefik.http.routers.sonarr.middlewares: authelia@file - - radarr: - image: linuxserver/radarr - environment: - PUID: ${NASCOMPOSE_UID?} - PGID: ${NASCOMPOSE_GID?} - networks: - - reverse-proxy - - torrents - - usenet - volumes: - - radarr_config:/config/ - - data:/data - restart: unless-stopped - labels: - traefik.enable: true - traefik.http.routers.radarr.middlewares: authelia@file - - bazarr: - image: linuxserver/bazarr - environment: - PUID: ${NASCOMPOSE_UID?} - PGID: ${NASCOMPOSE_GID?} - networks: - - reverse-proxy - volumes: - - bazarr_config:/config/ - - data:/data - restart: unless-stopped - labels: - traefik.enable: true - traefik.http.routers.bazarr.middlewares: authelia@file - ombi: image: linuxserver/ombi environment: @@ -89,8 +8,9 @@ services: PGID: ${NASCOMPOSE_GID?} networks: - reverse-proxy - # TODO: connect directly to sonarr/radarr - media-player + - tv-collector + - movie-collector volumes: - ombi_config:/config/ restart: unless-stopped @@ -100,45 +20,14 @@ services: networks: reverse-proxy: external: true - torrents: + tv-collector: external: true - usenet: + movie-collector: external: true media-player: external: true volumes: - data: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_DATA?} - - mylar_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/volumes/mylar/config/ - lazylibrarian_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/volumes/lazylibrarian/config/ - sonarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/volumes/sonarr/config/ - radarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/volumes/radarr/config/ - bazarr_config: - driver_opts: - type: none - o: bind - device: ${NASCOMPOSE_SERVICES?}/volumes/bazarr/config/ ombi_config: driver_opts: type: none diff --git a/services/book-collector/docker-compose.yml b/services/book-collector/docker-compose.yml new file mode 100644 index 0000000..205d40e --- /dev/null +++ b/services/book-collector/docker-compose.yml @@ -0,0 +1,41 @@ +name: Book collector + +services: + lazylibrarian: + image: linuxserver/lazylibrarian + profiles: [ebooks] + environment: + PUID: ${NASCOMPOSE_UID?} + PGID: ${NASCOMPOSE_GID?} + networks: + - reverse-proxy + - torrents + - usenet + volumes: + - lazylibrarian_config:/config/ + - data:/data + restart: unless-stopped + labels: + traefik.enable: true + traefik.http.routers.lazylibrarian.middlewares: authelia@file + +networks: + reverse-proxy: + external: true + torrents: + external: true + usenet: + external: true + +volumes: + data: + driver_opts: + type: none + o: bind + device: ${NASCOMPOSE_DATA?} + + lazylibrarian_config: + driver_opts: + type: none + o: bind + device: ${NASCOMPOSE_SERVICES?}/book-collector/volumes/lazylibrarian_config/ diff --git a/docker/volumes/bazarr/config/.gitkeep b/services/book-collector/volumes/lazylibrarian_config/.gitkeep similarity index 100% rename from docker/volumes/bazarr/config/.gitkeep rename to services/book-collector/volumes/lazylibrarian_config/.gitkeep diff --git a/services/comic-collector/docker-compose.yml b/services/comic-collector/docker-compose.yml new file mode 100644 index 0000000..150a555 --- /dev/null +++ b/services/comic-collector/docker-compose.yml @@ -0,0 +1,41 @@ +name: Comic collector + +services: + mylar: + image: linuxserver/mylar3 + profiles: [ebooks] + environment: + PUID: ${NASCOMPOSE_UID?} + PGID: ${NASCOMPOSE_GID?} + networks: + - reverse-proxy + - torrents + - usenet + volumes: + - mylar_config:/config/ + - data:/data + restart: unless-stopped + labels: + traefik.enable: true + traefik.http.routers.mylar.middlewares: authelia@file + +networks: + reverse-proxy: + external: true + torrents: + 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/docker/volumes/lazylibrarian/config/.gitkeep b/services/comic-collector/volumes/mylar_config/.gitkeep similarity index 100% rename from docker/volumes/lazylibrarian/config/.gitkeep rename to services/comic-collector/volumes/mylar_config/.gitkeep diff --git a/services/movie-collector/docker-compose.yml b/services/movie-collector/docker-compose.yml new file mode 100644 index 0000000..750125f --- /dev/null +++ b/services/movie-collector/docker-compose.yml @@ -0,0 +1,43 @@ +name: Movie collector + +services: + radarr: + image: linuxserver/radarr + environment: + PUID: ${NASCOMPOSE_UID?} + PGID: ${NASCOMPOSE_GID?} + networks: + - reverse-proxy + - movie-collector + - torrents + - usenet + volumes: + - radarr_config:/config/ + - data:/data + restart: unless-stopped + labels: + traefik.enable: true + traefik.http.routers.radarr.middlewares: authelia@file + +networks: + movie-collector: + + reverse-proxy: + external: true + torrents: + 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?}/volumes/radarr/config/ diff --git a/docker/volumes/mylar/config/.gitkeep b/services/movie-collector/volumes/radarr_config/.gitkeep similarity index 100% rename from docker/volumes/mylar/config/.gitkeep rename to services/movie-collector/volumes/radarr_config/.gitkeep diff --git a/services/subtitle-collector/docker-compose.yml b/services/subtitle-collector/docker-compose.yml new file mode 100644 index 0000000..09244fe --- /dev/null +++ b/services/subtitle-collector/docker-compose.yml @@ -0,0 +1,41 @@ +name: Subtitle collector + +services: + bazarr: + image: linuxserver/bazarr + environment: + PUID: ${NASCOMPOSE_UID?} + PGID: ${NASCOMPOSE_GID?} + networks: + - reverse-proxy + - movie-collector + - tv-collector + volumes: + - bazarr_config:/config/ + - data:/data + restart: unless-stopped + labels: + traefik.enable: true + traefik.http.routers.bazarr.middlewares: authelia@file + +networks: + reverse-proxy: + external: true + movie-collector: + external: true + tv-collector: + external: true + +volumes: + data: + driver_opts: + type: none + o: bind + device: ${NASCOMPOSE_DATA?} + + bazarr_config: + driver_opts: + type: none + o: bind + device: ${NASCOMPOSE_SERVICES?}/subtitle-collector/volumes/bazarr_config/ + \ No newline at end of file diff --git a/docker/volumes/radarr/config/.gitkeep b/services/subtitle-collector/volumes/bazarr_config/.gitkeep similarity index 100% rename from docker/volumes/radarr/config/.gitkeep rename to services/subtitle-collector/volumes/bazarr_config/.gitkeep diff --git a/services/tv-collector/docker-compose.yml b/services/tv-collector/docker-compose.yml new file mode 100644 index 0000000..f533e05 --- /dev/null +++ b/services/tv-collector/docker-compose.yml @@ -0,0 +1,45 @@ +name: TV collector + +services: + sonarr: + image: linuxserver/sonarr + environment: + PUID: ${NASCOMPOSE_UID?} + PGID: ${NASCOMPOSE_GID?} + networks: + - reverse-proxy + - tv-collector + - torrents + - usenet + volumes: + - sonarr_config:/config/ + - data:/data + restart: unless-stopped + labels: + traefik.enable: true + traefik.http.routers.sonarr.middlewares: authelia@file + +networks: + tv-collector: + + reverse-proxy: + external: true + torrents: + external: true + usenet: + 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/docker/volumes/sonarr/config/.gitkeep b/services/tv-collector/volumes/sonarr_config/.gitkeep similarity index 100% rename from docker/volumes/sonarr/config/.gitkeep rename to services/tv-collector/volumes/sonarr_config/.gitkeep