From e8312fc0d93c78ebe3d9213754a2a0ce852d36e6 Mon Sep 17 00:00:00 2001 From: wompmacho Date: Tue, 28 Apr 2026 02:25:52 +0000 Subject: [PATCH] update lables and add automation for dns / proxy --- docker_compose/dozzel/docker-compose.yaml | 9 ++++++++- docker_compose/gluetun/docker-compose.yaml | 13 +++++++++++++ docker_compose/navidrome/docker-compose.yaml | 1 + .../nginx-proxy-manager/docker-compose.yaml | 14 +++++++++++++- docker_compose/nicotine/docker-compose.yaml | 10 +++++----- .../pihole-external-dns/docker-compose.yaml | 13 +++++++++++++ 6 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 docker_compose/pihole-external-dns/docker-compose.yaml diff --git a/docker_compose/dozzel/docker-compose.yaml b/docker_compose/dozzel/docker-compose.yaml index bcdd88c..fa932f1 100644 --- a/docker_compose/dozzel/docker-compose.yaml +++ b/docker_compose/dozzel/docker-compose.yaml @@ -7,4 +7,11 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro ports: - ${DOZZEL_PORT}:8080 - restart: unless-stopped \ No newline at end of file + restart: unless-stopped + labels: + # Nginx Proxy Manager Automation + - "npm.proxy.domains=dozzle" + - "npm.proxy.port=${DOZZEL_PORT}" + - "npm.proxy.scheme=http" + # Pi-hole Automation (Point to Docker Host/Proxy IP) + - "pihole.custom-record=[[\"dozzle\", \"${DOCKER_HOST_IP}\"]]" \ No newline at end of file diff --git a/docker_compose/gluetun/docker-compose.yaml b/docker_compose/gluetun/docker-compose.yaml index 763f3d9..76fa19a 100644 --- a/docker_compose/gluetun/docker-compose.yaml +++ b/docker_compose/gluetun/docker-compose.yaml @@ -25,5 +25,18 @@ services: - '${NICOTINE_PORT}' - '${NICOTINE_INCOMMING}' restart: unless-stopped + labels: + # Nicotine Automation + - "npm.proxy.domains=nicotine" + - "npm.proxy.port=${NICOTINE_EXTERNAL_PORT}" + - "npm.proxy.scheme=http" + - "npm.proxy.websockets=true" + - "pihole.custom-record=[[\"nicotine\", \"${DOCKER_HOST_IP}\"]]" + # Torrent Automation + - "npm.proxy.1.domains=torrent" + - "npm.proxy.1.port=${TORRENT_EXTERNAL_PORT}" + - "npm.proxy.1.scheme=http" + - "npm.proxy.1.websockets=true" + - "pihole.custom-record.1=[[\"torrent\", \"${DOCKER_HOST_IP}\"]]" # for external containers use `network_mode: "container:gluetun"` \ No newline at end of file diff --git a/docker_compose/navidrome/docker-compose.yaml b/docker_compose/navidrome/docker-compose.yaml index 2c2f6df..6b589df 100644 --- a/docker_compose/navidrome/docker-compose.yaml +++ b/docker_compose/navidrome/docker-compose.yaml @@ -2,6 +2,7 @@ --- services: navidrome: + container_name: navidrome image: deluan/navidrome:latest user: 1000:1000 # should be owner of volumes ports: diff --git a/docker_compose/nginx-proxy-manager/docker-compose.yaml b/docker_compose/nginx-proxy-manager/docker-compose.yaml index 40d8841..6ab50b7 100644 --- a/docker_compose/nginx-proxy-manager/docker-compose.yaml +++ b/docker_compose/nginx-proxy-manager/docker-compose.yaml @@ -16,4 +16,16 @@ services: #DISABLE_IPV6: 'true' volumes: - /app/nginxproxy/data:/data - - /app/nginxproxy/letsencrypt:/etc/letsencrypt \ No newline at end of file + - /app/nginxproxy/letsencrypt:/etc/letsencrypt + + npm-sync: + container_name: npm-sync + image: ghcr.io/redth/npm-docker-sync:latest + restart: unless-stopped + environment: + - NPM_URL=http://nginx:81 + - NPM_EMAIL=${NPM_EMAIL} + - NPM_PASSWORD=${NPM_PASSWORD} + - DOCKER_HOST=unix:///var/run/docker.sock + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro \ No newline at end of file diff --git a/docker_compose/nicotine/docker-compose.yaml b/docker_compose/nicotine/docker-compose.yaml index fb89e54..28d007b 100644 --- a/docker_compose/nicotine/docker-compose.yaml +++ b/docker_compose/nicotine/docker-compose.yaml @@ -2,12 +2,12 @@ --- services: nicotineplus-proper: - image: 'sirjmann92/nicotineplus-proper:latest' # Or pull from GitHub: 'ghcr.io/sirjmann92/nicotineplus-proper:latest' + image: 'ghcr.io/sirjmann92/nicotineplus-proper:latest' # Or pull from GitHub: 'ghcr.io/sirjmann92/nicotineplus-proper:latest' container_name: nicotine network_mode: "container:gluetun" # Comment this line out if you're NOT using a VPN container - #ports: # Comment this line out if you ARE using a VPN container (line above) - #- '6565:6565' # Comment this line out if you ARE using a VPN container (lines above) - #- '2234:2234' # Comment this line out if you ARE using a VPN container (lines above) + #ports: # Comment this line out if you're NOT using a VPN container (line above) + #- '${NICOTINE_PORT}:${NICOTINE_PORT}' + #- '2234:2234' #env_file: .env # Optionally use a .env file to store environment variables and login credentials environment: # All environment variables are optional, defaults are listed (TZ, LANG, UMASK, and FORWARD_PORT have no default) - TZ=Your/Timezone @@ -28,7 +28,7 @@ services: # - NOTIFY_CHATROOM=False # - NOTIFY_MENTION=False # - FORWARD_PORT=12345 # Useful for dynamic port forwarding - # - WEB_UI_PORT=6565 # for custom webUI port assignment. Should match 'port' env variable or VPN webUI port + # - WEB_UI_PORT=${NICOTINE_PORT} # for custom webUI port assignment. Should match 'port' env variable or VPN webUI port # - WEB_UI_USER=YourWebUIUsername # for custom webUI basic auth username # - WEB_UI_PASSWORD=YourWebUIPassword # for custom webUI basic auth password # - HEALTHCHECK_ENABLED=false # Set to false to disable Docker healthcheck (default: true/enabled) diff --git a/docker_compose/pihole-external-dns/docker-compose.yaml b/docker_compose/pihole-external-dns/docker-compose.yaml new file mode 100644 index 0000000..9cf7d29 --- /dev/null +++ b/docker_compose/pihole-external-dns/docker-compose.yaml @@ -0,0 +1,13 @@ +# docker-pihole-dns-shim -- https://github.com/theonlysinjin/docker-pihole-dns-shim +--- +services: + pihole-dns-shim: + image: theonlysinjin/docker-pihole-dns-shim:latest + container_name: pihole-dns-shim + environment: + - PIHOLE_API=http://10.0.0.11:80/api + - PIHOLE_TOKEN=${PIHOLE_TOKEN} # Generate in Pi-hole Settings > API + - INTERVAL_SECONDS=10 + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + restart: unless-stopped