Semplificazione e unificazione di alcune porte oltre a fix minori della sintassi

This commit is contained in:
miracle091 2021-06-14 09:09:17 +02:00
parent c5fc84234b
commit 7db67ba32a
Signed by: miracle091
GPG Key ID: 73D6D9792AD73C84
15 changed files with 39 additions and 41 deletions

View File

@ -1,7 +1,7 @@
# Generale # Generale
JELLYFIN_SVC_DSC_PORT=1900
JELLYFIN_WEBUI_PORT=8096 JELLYFIN_WEBUI_PORT=8096
JELLYFIN_CLT_DSC_PORT=7359 JELLYFIN_CLT_DSC_PORT=7359
JELLYFIN_SVC_DSC_PORT=1900
JELLYFIN_CONFIG=/config JELLYFIN_CONFIG=/config
JELLYFIN_DATA=/data JELLYFIN_DATA=/data

View File

@ -47,9 +47,9 @@ services:
- custom-bridge - custom-bridge
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${JELLYFIN_SVC_DSC_PORT:-1900}:1900/udp # opzionale, servizio per il DLNA
- ${JELLYFIN_WEBUI_PORT:-8096}:8096 - ${JELLYFIN_WEBUI_PORT:-8096}:8096
- ${JELLYFIN_CLT_DSC_PORT:-7359}/udp:7359/udp # opzionale, servizio discovery per i client - ${JELLYFIN_CLT_DSC_PORT:-7359}:7359/udp # opzionale, servizio discovery per i client
- ${JELLYFIN_SVC_DSC_PORT:-1900}/udp:1900/udp # opzionale, servizio DLNA
env_file: .env env_file: .env
volumes: volumes:
- ${JELLYFIN_CONFIG:-/home/docker/jellyfin/config}:/config - ${JELLYFIN_CONFIG:-/home/docker/jellyfin/config}:/config
@ -66,16 +66,16 @@ networks:
`.env` `.env`
```bash ```bash
# Generale # Generale
JELLYFIN_SVC_DSC_PORT=1900
JELLYFIN_WEBUI_PORT=8096 JELLYFIN_WEBUI_PORT=8096
JELLYFIN_CLT_DSC_PORT=7359 JELLYFIN_CLT_DSC_PORT=7359
JELLYFIN_SVC_DSC_PORT=1900
JELLYFIN_CONFIG=/config JELLYFIN_CONFIG=/config
JELLYFIN_DATA=/data JELLYFIN_DATA=/data
# Jellyfin # Jellyfin
TZ=Europe/Amsterdam TZ=Europe/Amsterdam
# ATTIVARE IN BASE AL PROPRIO HARDWARE E NON ATTIVARE ENTRAMBI, in quanto ne basta uno solo # ATTIVARE IN BASE AL PROPRIO HARDWARE E NON ATTIVARE ENTRAMBI, in quanto ne basta uno solo
#DOCKER_MODS=linuxserver/mods:jellyfin-amd # necessario per usare GPU AMD (anche quelle integrate) #DOCKER_MODS=linuxserver/mods:jellyfin-amd # necessario per usare GPU AMD (anche quelle integrate nella CPU)
#DOCKER_MODS=linuxserver/mods:jellyfin-opencl-intel # necessario per usare OpenCL-Intel #DOCKER_MODS=linuxserver/mods:jellyfin-opencl-intel # necessario per usare OpenCL-Intel
``` ```

View File

@ -9,9 +9,9 @@ services:
- custom-bridge - custom-bridge
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${JELLYFIN_SVC_DSC_PORT:-1900}:1900/udp
- ${JELLYFIN_WEBUI_PORT:-8096}:8096 - ${JELLYFIN_WEBUI_PORT:-8096}:8096
- ${JELLYFIN_CLT_DSC_PORT:-7359}/udp:7359/udp - ${JELLYFIN_CLT_DSC_PORT:-7359}:7359/udp
- ${JELLYFIN_SVC_DSC_PORT:-1900}/udp:1900/udp
env_file: .env env_file: .env
volumes: volumes:
- ${JELLYFIN_CONFIG:-/home/docker/jellyfin/config}:/config - ${JELLYFIN_CONFIG:-/home/docker/jellyfin/config}:/config

View File

@ -2,9 +2,8 @@
SYNCTHING_CONFIG=/home/docker/syncthing/config SYNCTHING_CONFIG=/home/docker/syncthing/config
SYNCTHING_DATA=/home/docker/syncthing/data SYNCTHING_DATA=/home/docker/syncthing/data
SYNCTHING_WEBUI_PORT=8384 SYNCTHING_WEBUI_PORT=8384
SYNCTHING_LST_TCP=22000 SYNCTHING_DSC_PORT=21027
SYNCTHING_LST_UDP=22000 SYNCTHING_LST_PORT=22000
SYNCTHING_PORT_DSC=21027
# Syncthing # Syncthing
TZ=Europe/Amsterdam TZ=Europe/Amsterdam

View File

@ -47,9 +47,9 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${SYNCTHING_WEBUI_PORT:-8384}:8384 - ${SYNCTHING_WEBUI_PORT:-8384}:8384
- ${SYNCTHING_LST_TCP:-22000}:22000 - ${SYNCTHING_DSC_PORT:-21027}:21027/udp
- ${SYNCTHING_LST_UDP:-22000}/udp:22000/udp - ${SYNCTHING_LST_PORT:-22000}:22000/tcp
- ${SYNCTHING_PORT_DSC:-21027}/udp:21027/udp - ${SYNCTHING_LST_PORT:-22000}:22000/udp
env_file: .env env_file: .env
sysctls: sysctls:
- net.core.rmem_max=2097152 - net.core.rmem_max=2097152
@ -69,9 +69,8 @@ networks:
SYNCTHING_CONFIG=/home/docker/syncthing/config SYNCTHING_CONFIG=/home/docker/syncthing/config
SYNCTHING_DATA=/home/docker/syncthing/data SYNCTHING_DATA=/home/docker/syncthing/data
SYNCTHING_WEBUI_PORT=8384 SYNCTHING_WEBUI_PORT=8384
SYNCTHING_LST_TCP=22000 SYNCTHING_DSC_PORT=21027
SYNCTHING_LST_UDP=22000 SYNCTHING_LST_PORT=22000
SYNCTHING_PORT_DSC=21027
# Syncthing # Syncthing
TZ=Europe/Amsterdam TZ=Europe/Amsterdam

View File

@ -5,14 +5,14 @@ services:
image: ghcr.io/linuxserver/syncthing image: ghcr.io/linuxserver/syncthing
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
networks: networks:
- custom-bridge - custom-bridge
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${SYNCTHING_WEBUI_PORT:-8384}:8384 - ${SYNCTHING_WEBUI_PORT:-8384}:8384
- ${SYNCTHING_LST_TCP:-22000}:22000 - ${SYNCTHING_DSC_PORT:-21027}:21027/udp
- ${SYNCTHING_LST_UDP:-22000}/udp:22000/udp - ${SYNCTHING_LST_PORT:-22000}:22000/tcp
- ${SYNCTHING_PORT_DSC:-21027}/udp:21027/udp - ${SYNCTHING_LST_PORT:-22000}:22000/udp
env_file: .env env_file: .env
sysctls: sysctls:
- net.core.rmem_max=2097152 - net.core.rmem_max=2097152

View File

@ -2,8 +2,7 @@
TRANSMISSION_CONFIG=/home/docker/transmission/config TRANSMISSION_CONFIG=/home/docker/transmission/config
TRANSMISSION_DOWNLOADS=/home/docker/transmission/downloads TRANSMISSION_DOWNLOADS=/home/docker/transmission/downloads
TRANSMISSION_WEBUI_PORT=9091 TRANSMISSION_WEBUI_PORT=9091
TRANSMISSION_TCP_PORT=51413 TRANSMISSION_EXT_PORT=51413
TRANSMISSION_UDP_PORT=51413
# transmission # transmission
TZ=Europe/Amsterdam TZ=Europe/Amsterdam

View File

@ -47,8 +47,8 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${TRANSMISSION_WEBUI_PORT:-9091}:9091 - ${TRANSMISSION_WEBUI_PORT:-9091}:9091
- ${TRANSMISSION_TCP_PORT:-51413}:51413 - ${TRANSMISSION_EXT_PORT:-51413}:51413/tcp
- ${TRANSMISSION_UDP_PORT:-51413}/udp:51413/udp - ${TRANSMISSION_EXT_PORT:-51413}:51413/udp
env_file: .env env_file: .env
volumes: volumes:
- ${TRANSMISSION_CONFIG:-/home/docker/transmission/config}:/config - ${TRANSMISSION_CONFIG:-/home/docker/transmission/config}:/config
@ -66,8 +66,7 @@ networks:
TRANSMISSION_CONFIG=/home/docker/transmission/config TRANSMISSION_CONFIG=/home/docker/transmission/config
TRANSMISSION_DOWNLOADS=/home/docker/transmission/downloads TRANSMISSION_DOWNLOADS=/home/docker/transmission/downloads
TRANSMISSION_WEBUI_PORT=9091 TRANSMISSION_WEBUI_PORT=9091
TRANSMISSION_TCP_PORT=51413 TRANSMISSION_EXT_PORT=51413
TRANSMISSION_UDP_PORT=51413
# transmission # transmission
TZ=Europe/Amsterdam TZ=Europe/Amsterdam

View File

@ -10,8 +10,8 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${TRANSMISSION_WEBUI_PORT:-9091}:9091 - ${TRANSMISSION_WEBUI_PORT:-9091}:9091
- ${TRANSMISSION_TCP_PORT:-51413}:51413 - ${TRANSMISSION_EXT_PORT:-51413}:51413/tcp
- ${TRANSMISSION_UDP_PORT:-51413}/udp:51413/udp - ${TRANSMISSION_EXT_PORT:-51413}:51413/udp
env_file: .env env_file: .env
volumes: volumes:
- ${TRANSMISSION_CONFIG:-/home/docker/transmission/config}:/config - ${TRANSMISSION_CONFIG:-/home/docker/transmission/config}:/config

View File

@ -1,8 +1,8 @@
# Generale # Generale
UNIFI_STUN_PORT=3478
UNIFI_WEBUI_PORT=8080 UNIFI_WEBUI_PORT=8080
UNIFI_HTTPS_PORT=8443 UNIFI_HTTPS_PORT=8443
UNIFI_AP_DSV_PORT=10001 UNIFI_AP_DSV_PORT=10001
UNIFI_STUN_PORT=3478
UNIFI_CONFIG=/config UNIFI_CONFIG=/config
# Unifi # Unifi

View File

@ -40,14 +40,14 @@ services:
image: ghcr.io/linuxserver/unifi-controller image: ghcr.io/linuxserver/unifi-controller
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
networks: networks:
- custom-bridge - custom-bridge
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${UNIFI_STUN_PORT:-3478}:3478/udp
- ${UNIFI_WEBUI_PORT:-8080}:8080 - ${UNIFI_WEBUI_PORT:-8080}:8080
- ${UNIFI_HTTPS_PORT:-8443}:8443 - ${UNIFI_HTTPS_PORT:-8443}:8443
- ${UNIFI_AP_DSV_PORT:-10001}/udp:10001/udp - ${UNIFI_AP_DSV_PORT:-10001}:10001/udp
- ${UNIFI_STUN_PORT:-3478}/udp:3478/udp
env_file: .env env_file: .env
volumes: volumes:
- ${UNIFI_CONFIG:-/home/docker/unifi/config}:/config - ${UNIFI_CONFIG:-/home/docker/unifi/config}:/config
@ -61,10 +61,10 @@ networks:
`.env` `.env`
```bash ```bash
# Generale # Generale
UNIFI_STUN_PORT=3478
UNIFI_WEBUI_PORT=8080 UNIFI_WEBUI_PORT=8080
UNIFI_HTTPS_PORT=8443 UNIFI_HTTPS_PORT=8443
UNIFI_AP_DSV_PORT=10001 UNIFI_AP_DSV_PORT=10001
UNIFI_STUN_PORT=3478
UNIFI_CONFIG=/config UNIFI_CONFIG=/config
# Unifi # Unifi

View File

@ -9,10 +9,10 @@ services:
- custom-bridge - custom-bridge
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${UNIFI_STUN_PORT:-3478}:3478/udp
- ${UNIFI_WEBUI_PORT:-8080}:8080 - ${UNIFI_WEBUI_PORT:-8080}:8080
- ${UNIFI_HTTPS_PORT:-8443}:8443 - ${UNIFI_HTTPS_PORT:-8443}:8443
- ${UNIFI_AP_DSV_PORT:-10001}/udp:10001/udp - ${UNIFI_AP_DSV_PORT:-10001}:10001/udp
- ${UNIFI_STUN_PORT:-3478}/udp:3478/udp
env_file: .env env_file: .env
volumes: volumes:
- ${UNIFI_CONFIG:-/home/docker/unifi/config}:/config - ${UNIFI_CONFIG:-/home/docker/unifi/config}:/config

View File

@ -1,6 +1,6 @@
# Watchtower # Watchtower
WATCHTOWER_SCHEDULE=0 0 * * SAT WATCHTOWER_SCHEDULE="0 0 * * SAT"
WATCHTOWER_CLEANUP=true WATCHTOWER_CLEANUP=true
WATCHTOWER_TIMEOUT=30s WATCHTOWER_TIMEOUT="120s"
WATCHTOWER_DEBUG=false WATCHTOWER_DEBUG=false
WATCHTOWER_INCLUDE_STOPPED=false WATCHTOWER_INCLUDE_STOPPED=false

View File

@ -10,7 +10,7 @@ Watchtower è un'applicazione per monitorare e aggiornare i cointainer:
- Supporto alle repo locali e/o private, compreso il supporto alle credenziali di accesso (se necessarie) - Supporto alle repo locali e/o private, compreso il supporto alle credenziali di accesso (se necessarie)
- Controllo, aggiornamento e riavvio dei container, in modo totalmente autonomo - Controllo, aggiornamento e riavvio dei container, in modo totalmente autonomo
- Cancellazione automatica delle vecchie images - Cancellazione automatica delle vecchie images
- Possibilità di notifica in caso di aggiornamenti - Possibilità di [notifica](https://containrrr.dev/watchtower/notifications/) in caso di aggiornamenti
## Struttura file e cartelle ## Struttura file e cartelle
``` ```
@ -43,14 +43,15 @@ services:
env_file: .env env_file: .env
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /etc/localtime:/etc/localtime:ro
``` ```
`.env` `.env`
```bash ```bash
# Watchtower # Watchtower
WATCHTOWER_SCHEDULE=0 0 * * SAT # https://crontab.guru/#0_0_*_*_SAT WATCHTOWER_SCHEDULE="0 0 * * SAT" # https://crontab.guru/#0_0_*_*_SAT
WATCHTOWER_CLEANUP=true WATCHTOWER_CLEANUP=true
WATCHTOWER_TIMEOUT=30s WATCHTOWER_TIMEOUT="120s"
WATCHTOWER_DEBUG=false WATCHTOWER_DEBUG=false
WATCHTOWER_INCLUDE_STOPPED=false WATCHTOWER_INCLUDE_STOPPED=false
``` ```

View File

@ -8,4 +8,5 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: .env env_file: .env
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /etc/localtime:/etc/localtime:ro