diff --git a/torrents/torrents.yaml b/torrents/torrents.yaml index 7ff4342..f38da27 100644 --- a/torrents/torrents.yaml +++ b/torrents/torrents.yaml @@ -15,8 +15,7 @@ services: mode: replicated replicas: 1 restart_policy: - delay: 60s - window: 120s + delay: 5s jackett: image: linuxserver/jackett @@ -26,28 +25,31 @@ services: - PGID=${PGID} volumes: - jackett_config:/config - - data:/data - ports: - - target: 9117 - published: ${JACKETTPORT} - protocol: tcp - mode: host + - downloads:/downloads +# ports: +# - target: 9117 +# published: ${JACKETTPORT} +# protocol: tcp +# mode: host networks: - external - tornet - internal - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9117"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 40s + - traefik-net deploy: mode: replicated replicas: 1 restart_policy: - delay: 60s - window: 120s + delay: 5s + labels: + traefik.enable: "true" + traefik.frontend.rule: "Host:jackett.lan" + traefik.port: 9117 + traefik.frontend.entryPoints: localhttp,localhttps + traefik.docker.network: traefik-net + traefik.frontend.headers.STSSeconds: 63072000 + traefik.frontend.headers.STSIncludeSubdomains: "true" + traefik.frontend.headers.STSPreload: "true" radarr: image: linuxserver/radarr @@ -57,29 +59,18 @@ services: - PGID=${PGID} volumes: - radarr_config:/config - - data:/data - ports: - - target: 7878 - published: ${RADARRPORT} - protocol: tcp - mode: host + - downloads:/downloads + - radarr_movies:/movies networks: - - external + - external # tymczasowo do momentku kiedy nie naprawia radarr-a - tornet - internal - traefik-net - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:7878"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 40s deploy: mode: replicated replicas: 1 restart_policy: - delay: 60s - window: 120s + delay: 5s labels: traefik.enable: "true" traefik.frontend.rule: "Host:radarr.${HOSTDOMAIN}" @@ -97,29 +88,18 @@ services: - PGID=${PGID} volumes: - sonarr_config:/config - - data:/data - ports: - - target: 8989 - published: ${SONARRPORT} - protocol: tcp - mode: host + - downloads:/downloads + - sonarr_tvs:/tv networks: - - external + - external # tymczasowo do momentku kiedy nie naprawia sonarr-a - tornet - traefik-net - internal - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8989"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 40s deploy: mode: replicated replicas: 1 restart_policy: - delay: 60s - window: 120s + delay: 5s labels: traefik.enable: "true" traefik.frontend.rule: "Host:sonarr.${HOSTDOMAIN}" @@ -137,24 +117,14 @@ services: - PGID=${PGID} volumes: - lidarr_config:/config - - data:/data + - downloads:/downloads + - lidarr_audio:/audio - /dev/null:/music - ports: - - target: 8686 - published: ${LIDARRPORT} - protocol: tcp - mode: host networks: - external - tornet - traefik-net - internal - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8686"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 40s deploy: mode: replicated replicas: 1 @@ -170,6 +140,36 @@ services: traefik.frontend.headers.STSIncludeSubdomains: "true" traefik.frontend.headers.STSPreload: "true" + readarr: + image: linuxserver/readarr:nightly + environment: + - TZ=${TZ} + - PUID=${PUID} + - PGID=${PGID} + volumes: + - readarr_config:/config + - downloads:/downloads + - readarr_books:/books + networks: + - external + - tornet + - traefik-net + - internal + deploy: + mode: replicated + replicas: 1 + restart_policy: + delay: 5s + labels: + traefik.enable: "true" + traefik.frontend.rule: "Host:readarr.${HOSTDOMAIN}" + traefik.port: 8787 + traefik.docker.network: traefik-net + traefik.frontend.headers.STSSeconds: 63072000 + traefik.frontend.headers.STSIncludeSubdomains: "true" + traefik.frontend.headers.STSPreload: "true" + + bazarr: image: linuxserver/bazarr environment: @@ -178,28 +178,18 @@ services: - PGID=${PGID} volumes: - bazarr_config:/config - - data:/data - ports: - - target: 6767 - published: ${BAZARRPORT} - protocol: tcp - mode: host + - downloads:/downloads + - sonarr_tvs:/tv + - radarr_movies:/movies networks: - external # tymczasowo do momentku kiedy nie naprawia sonarr-a - tornet - traefik-net - internal - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:6767"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 40s deploy: mode: replicated replicas: 1 restart_policy: - condition: on-failure delay: 5s labels: traefik.enable: "true" @@ -223,10 +213,10 @@ services: published: ${DELUGEDAEMONPORT} protocol: tcp mode: host - - target: 8112 - published: ${DELUGEWEBUIPORT} - protocol: tcp - mode: host +# - target: 8112 +# published: 8112 +# protocol: tcp +# mode: host - target: ${DELUGEINCOMINGPORT} published: ${DELUGEINCOMINGPORT} protocol: tcp @@ -240,23 +230,33 @@ services: - internal volumes: - deluge_config:/config - - data:/data - - /dev/null:/downloads - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8112"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 40s + - downloads:/downloads deploy: mode: replicated replicas: 1 restart_policy: - delay: 60s - window: 120s + delay: 5s + + deluge_exporter: + image: tobbez/deluge_exporter + environment: + - DELUGE_HOST=deluge + - DELUGE_CONFIG_DIR=/config + networks: + - internal + - prometheus_prometheus-net + volumes: + - deluge_config:/config:ro + deploy: + mode: replicated + replicas: 1 + restart_policy: + delay: 5s smb: image: dperson-samba:armhf +# image: dperson/samba +# image: quentinb69/samba:dperson environment: - TZ=${TZ} - USERID=${PUID} @@ -269,34 +269,43 @@ services: networks: - external volumes: - - data:/data + - downloads:/downloads + - sonarr_tvs:/tv + - radarr_movies:/movies + - lidarr_audio:/audio + - readarr_books:/books - jackett_config:/configs/jackett - radarr_config:/configs/radarr - sonarr_config:/configs/sonarr - deluge_config:/configs/deluge - bazarr_config:/configs/bazarr - lidarr_config:/configs/lidarr + - readarr_config:/configs/readarr - smb_lib:/var/lib/samba - smb_run:/run/samba - smb_etc:/etc - smb_cache:/var/cache/samba - smb_log:/var/log/samba - command: '-u "${SMBADMIN};${SMBADMINPASS}" -u "${SMBUSER};${SMBUSERPASS}" -u "${SMBUSERMEDIA};${SMBUSERMEDIAPASS}" -s "configs;/configs;yes;no;no;${SMBADMIN}" -s "tv shows;/data/tv;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "audio;/data/audio;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "movies;/data/movies;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "downloads;/data/downloads;yes;no;no;${SMBADMIN},${SMBUSER}"' #Note, you should only provide one command statement + command: '-u "${SMBADMIN};${SMBADMINPASS}" -u "${SMBUSER};${SMBUSERPASS}" -u "${SMBUSERMEDIA};${SMBUSERMEDIAPASS}" -s "configs;/configs;yes;no;no;${SMBADMIN}" -s "tv shows;/tv;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "audio;/audio;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "movies;/movies;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "books;/books;yes;no;no;${SMBADMIN},${SMBUSER},${SMBUSERMEDIA}" -s "downloads;/downloads;yes;no;no;${SMBADMIN},${SMBUSER}"' #Note, you should only provide one command statement deploy: mode: replicated replicas: 1 restart_policy: - delay: 60s - window: 120s + delay: 5s volumes: - data: + downloads: jackett_config: radarr_config: + radarr_movies: sonarr_config: + sonarr_tvs: deluge_config: bazarr_config: lidarr_config: + lidarr_audio: + readarr_config: + readarr_books: smb_lib: smb_run: smb_etc: @@ -311,20 +320,16 @@ networks: internal: driver: overlay internal: true + prometheus_prometheus-net: + external: true traefik-net: external: true - internal: true ### Environment variables # HOSTDOMAIN example.net # JACKETTPORT 9117 # DELUGEINCOMINGPORT 62054 # DELUGEDAEMONPORT 58846 -# DELUGEWEBUIPORT 8112 -# RADARRPORT 7878 -# SONARRPORT 8989 -# BAZARRPORT 6767 -# LIDARRPORT 8686 # SMBPORT 445 # SMBADMIN admin # SMBADMINPASS adminPass @@ -334,4 +339,4 @@ networks: # SMBUSERMEDIAPASS mediaPass # PUID 1000 # PGID 1000 -# TZ Europe/Warsaw +# TZ Europe/Warsaw \ No newline at end of file