From 7db67ba32ab5c09074daca05bec28012ae12b954 Mon Sep 17 00:00:00 2001 From: miracle091 Date: Mon, 14 Jun 2021 09:09:17 +0200 Subject: [PATCH] Semplificazione e unificazione di alcune porte oltre a fix minori della sintassi --- jellyfin/.env | 2 +- jellyfin/README.md | 8 ++++---- jellyfin/docker-compose.yml | 4 ++-- syncthing/.env | 5 ++--- syncthing/README.md | 11 +++++------ syncthing/docker-compose.yml | 8 ++++---- transmission/.env | 3 +-- transmission/README.md | 7 +++---- transmission/docker-compose.yml | 4 ++-- unifi/.env | 2 +- unifi/README.md | 8 ++++---- unifi/docker-compose.yml | 4 ++-- watchtower/.env | 4 ++-- watchtower/README.md | 7 ++++--- watchtower/docker-compose.yml | 3 ++- 15 files changed, 39 insertions(+), 41 deletions(-) diff --git a/jellyfin/.env b/jellyfin/.env index 481839d..2eb96b7 100644 --- a/jellyfin/.env +++ b/jellyfin/.env @@ -1,7 +1,7 @@ # Generale +JELLYFIN_SVC_DSC_PORT=1900 JELLYFIN_WEBUI_PORT=8096 JELLYFIN_CLT_DSC_PORT=7359 -JELLYFIN_SVC_DSC_PORT=1900 JELLYFIN_CONFIG=/config JELLYFIN_DATA=/data diff --git a/jellyfin/README.md b/jellyfin/README.md index 4706fb9..02a6603 100644 --- a/jellyfin/README.md +++ b/jellyfin/README.md @@ -47,9 +47,9 @@ services: - custom-bridge restart: unless-stopped ports: + - ${JELLYFIN_SVC_DSC_PORT:-1900}:1900/udp # opzionale, servizio per il DLNA - ${JELLYFIN_WEBUI_PORT:-8096}:8096 - - ${JELLYFIN_CLT_DSC_PORT:-7359}/udp:7359/udp # opzionale, servizio discovery per i client - - ${JELLYFIN_SVC_DSC_PORT:-1900}/udp:1900/udp # opzionale, servizio DLNA + - ${JELLYFIN_CLT_DSC_PORT:-7359}:7359/udp # opzionale, servizio discovery per i client env_file: .env volumes: - ${JELLYFIN_CONFIG:-/home/docker/jellyfin/config}:/config @@ -66,16 +66,16 @@ networks: `.env` ```bash # Generale +JELLYFIN_SVC_DSC_PORT=1900 JELLYFIN_WEBUI_PORT=8096 JELLYFIN_CLT_DSC_PORT=7359 -JELLYFIN_SVC_DSC_PORT=1900 JELLYFIN_CONFIG=/config JELLYFIN_DATA=/data # Jellyfin TZ=Europe/Amsterdam # 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 ``` diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml index f0ef07b..97b40df 100644 --- a/jellyfin/docker-compose.yml +++ b/jellyfin/docker-compose.yml @@ -9,9 +9,9 @@ services: - custom-bridge restart: unless-stopped ports: + - ${JELLYFIN_SVC_DSC_PORT:-1900}:1900/udp - ${JELLYFIN_WEBUI_PORT:-8096}:8096 - - ${JELLYFIN_CLT_DSC_PORT:-7359}/udp:7359/udp - - ${JELLYFIN_SVC_DSC_PORT:-1900}/udp:1900/udp + - ${JELLYFIN_CLT_DSC_PORT:-7359}:7359/udp env_file: .env volumes: - ${JELLYFIN_CONFIG:-/home/docker/jellyfin/config}:/config diff --git a/syncthing/.env b/syncthing/.env index 3cde39f..7b3b3ef 100644 --- a/syncthing/.env +++ b/syncthing/.env @@ -2,9 +2,8 @@ SYNCTHING_CONFIG=/home/docker/syncthing/config SYNCTHING_DATA=/home/docker/syncthing/data SYNCTHING_WEBUI_PORT=8384 -SYNCTHING_LST_TCP=22000 -SYNCTHING_LST_UDP=22000 -SYNCTHING_PORT_DSC=21027 +SYNCTHING_DSC_PORT=21027 +SYNCTHING_LST_PORT=22000 # Syncthing TZ=Europe/Amsterdam \ No newline at end of file diff --git a/syncthing/README.md b/syncthing/README.md index b295232..f14a85f 100644 --- a/syncthing/README.md +++ b/syncthing/README.md @@ -47,9 +47,9 @@ services: restart: unless-stopped ports: - ${SYNCTHING_WEBUI_PORT:-8384}:8384 - - ${SYNCTHING_LST_TCP:-22000}:22000 - - ${SYNCTHING_LST_UDP:-22000}/udp:22000/udp - - ${SYNCTHING_PORT_DSC:-21027}/udp:21027/udp + - ${SYNCTHING_DSC_PORT:-21027}:21027/udp + - ${SYNCTHING_LST_PORT:-22000}:22000/tcp + - ${SYNCTHING_LST_PORT:-22000}:22000/udp env_file: .env sysctls: - net.core.rmem_max=2097152 @@ -69,9 +69,8 @@ networks: SYNCTHING_CONFIG=/home/docker/syncthing/config SYNCTHING_DATA=/home/docker/syncthing/data SYNCTHING_WEBUI_PORT=8384 -SYNCTHING_LST_TCP=22000 -SYNCTHING_LST_UDP=22000 -SYNCTHING_PORT_DSC=21027 +SYNCTHING_DSC_PORT=21027 +SYNCTHING_LST_PORT=22000 # Syncthing TZ=Europe/Amsterdam diff --git a/syncthing/docker-compose.yml b/syncthing/docker-compose.yml index 65581bc..207f339 100644 --- a/syncthing/docker-compose.yml +++ b/syncthing/docker-compose.yml @@ -5,14 +5,14 @@ services: image: ghcr.io/linuxserver/syncthing security_opt: - no-new-privileges:true - networks: + networks: - custom-bridge restart: unless-stopped ports: - ${SYNCTHING_WEBUI_PORT:-8384}:8384 - - ${SYNCTHING_LST_TCP:-22000}:22000 - - ${SYNCTHING_LST_UDP:-22000}/udp:22000/udp - - ${SYNCTHING_PORT_DSC:-21027}/udp:21027/udp + - ${SYNCTHING_DSC_PORT:-21027}:21027/udp + - ${SYNCTHING_LST_PORT:-22000}:22000/tcp + - ${SYNCTHING_LST_PORT:-22000}:22000/udp env_file: .env sysctls: - net.core.rmem_max=2097152 diff --git a/transmission/.env b/transmission/.env index b4bb33c..5f7c51e 100644 --- a/transmission/.env +++ b/transmission/.env @@ -2,8 +2,7 @@ TRANSMISSION_CONFIG=/home/docker/transmission/config TRANSMISSION_DOWNLOADS=/home/docker/transmission/downloads TRANSMISSION_WEBUI_PORT=9091 -TRANSMISSION_TCP_PORT=51413 -TRANSMISSION_UDP_PORT=51413 +TRANSMISSION_EXT_PORT=51413 # transmission TZ=Europe/Amsterdam diff --git a/transmission/README.md b/transmission/README.md index 8fd93cb..6c410b6 100644 --- a/transmission/README.md +++ b/transmission/README.md @@ -47,8 +47,8 @@ services: restart: unless-stopped ports: - ${TRANSMISSION_WEBUI_PORT:-9091}:9091 - - ${TRANSMISSION_TCP_PORT:-51413}:51413 - - ${TRANSMISSION_UDP_PORT:-51413}/udp:51413/udp + - ${TRANSMISSION_EXT_PORT:-51413}:51413/tcp + - ${TRANSMISSION_EXT_PORT:-51413}:51413/udp env_file: .env volumes: - ${TRANSMISSION_CONFIG:-/home/docker/transmission/config}:/config @@ -66,8 +66,7 @@ networks: TRANSMISSION_CONFIG=/home/docker/transmission/config TRANSMISSION_DOWNLOADS=/home/docker/transmission/downloads TRANSMISSION_WEBUI_PORT=9091 -TRANSMISSION_TCP_PORT=51413 -TRANSMISSION_UDP_PORT=51413 +TRANSMISSION_EXT_PORT=51413 # transmission TZ=Europe/Amsterdam diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml index 190ec15..44e5ebb 100644 --- a/transmission/docker-compose.yml +++ b/transmission/docker-compose.yml @@ -10,8 +10,8 @@ services: restart: unless-stopped ports: - ${TRANSMISSION_WEBUI_PORT:-9091}:9091 - - ${TRANSMISSION_TCP_PORT:-51413}:51413 - - ${TRANSMISSION_UDP_PORT:-51413}/udp:51413/udp + - ${TRANSMISSION_EXT_PORT:-51413}:51413/tcp + - ${TRANSMISSION_EXT_PORT:-51413}:51413/udp env_file: .env volumes: - ${TRANSMISSION_CONFIG:-/home/docker/transmission/config}:/config diff --git a/unifi/.env b/unifi/.env index ef7c98d..ba28e5c 100644 --- a/unifi/.env +++ b/unifi/.env @@ -1,8 +1,8 @@ # Generale +UNIFI_STUN_PORT=3478 UNIFI_WEBUI_PORT=8080 UNIFI_HTTPS_PORT=8443 UNIFI_AP_DSV_PORT=10001 -UNIFI_STUN_PORT=3478 UNIFI_CONFIG=/config # Unifi diff --git a/unifi/README.md b/unifi/README.md index ca36333..ba070e3 100644 --- a/unifi/README.md +++ b/unifi/README.md @@ -40,14 +40,14 @@ services: image: ghcr.io/linuxserver/unifi-controller security_opt: - no-new-privileges:true - networks: + networks: - custom-bridge restart: unless-stopped ports: + - ${UNIFI_STUN_PORT:-3478}:3478/udp - ${UNIFI_WEBUI_PORT:-8080}:8080 - ${UNIFI_HTTPS_PORT:-8443}:8443 - - ${UNIFI_AP_DSV_PORT:-10001}/udp:10001/udp - - ${UNIFI_STUN_PORT:-3478}/udp:3478/udp + - ${UNIFI_AP_DSV_PORT:-10001}:10001/udp env_file: .env volumes: - ${UNIFI_CONFIG:-/home/docker/unifi/config}:/config @@ -61,10 +61,10 @@ networks: `.env` ```bash # Generale +UNIFI_STUN_PORT=3478 UNIFI_WEBUI_PORT=8080 UNIFI_HTTPS_PORT=8443 UNIFI_AP_DSV_PORT=10001 -UNIFI_STUN_PORT=3478 UNIFI_CONFIG=/config # Unifi diff --git a/unifi/docker-compose.yml b/unifi/docker-compose.yml index 0249c70..d65ec9a 100644 --- a/unifi/docker-compose.yml +++ b/unifi/docker-compose.yml @@ -9,10 +9,10 @@ services: - custom-bridge restart: unless-stopped ports: + - ${UNIFI_STUN_PORT:-3478}:3478/udp - ${UNIFI_WEBUI_PORT:-8080}:8080 - ${UNIFI_HTTPS_PORT:-8443}:8443 - - ${UNIFI_AP_DSV_PORT:-10001}/udp:10001/udp - - ${UNIFI_STUN_PORT:-3478}/udp:3478/udp + - ${UNIFI_AP_DSV_PORT:-10001}:10001/udp env_file: .env volumes: - ${UNIFI_CONFIG:-/home/docker/unifi/config}:/config diff --git a/watchtower/.env b/watchtower/.env index 0022144..c39dc24 100644 --- a/watchtower/.env +++ b/watchtower/.env @@ -1,6 +1,6 @@ # Watchtower -WATCHTOWER_SCHEDULE=0 0 * * SAT +WATCHTOWER_SCHEDULE="0 0 * * SAT" WATCHTOWER_CLEANUP=true -WATCHTOWER_TIMEOUT=30s +WATCHTOWER_TIMEOUT="120s" WATCHTOWER_DEBUG=false WATCHTOWER_INCLUDE_STOPPED=false \ No newline at end of file diff --git a/watchtower/README.md b/watchtower/README.md index 4113ce5..05dd9d7 100644 --- a/watchtower/README.md +++ b/watchtower/README.md @@ -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) - Controllo, aggiornamento e riavvio dei container, in modo totalmente autonomo - 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 ``` @@ -43,14 +43,15 @@ services: env_file: .env volumes: - /var/run/docker.sock:/var/run/docker.sock + - /etc/localtime:/etc/localtime:ro ``` `.env` ```bash # 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_TIMEOUT=30s +WATCHTOWER_TIMEOUT="120s" WATCHTOWER_DEBUG=false WATCHTOWER_INCLUDE_STOPPED=false ``` diff --git a/watchtower/docker-compose.yml b/watchtower/docker-compose.yml index e2b9718..9610757 100644 --- a/watchtower/docker-compose.yml +++ b/watchtower/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: unless-stopped env_file: .env volumes: - - /var/run/docker.sock:/var/run/docker.sock \ No newline at end of file + - /var/run/docker.sock:/var/run/docker.sock + - /etc/localtime:/etc/localtime:ro \ No newline at end of file