From 367ed90629d317bd7c188e39a4e4eafc8e2956cd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 15 Nov 2025 13:34:22 -0500 Subject: [PATCH 1/9] Adding Tdarr server. --- docker-compose.yml | 90 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 300046d6..ef50fb5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -762,7 +762,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro - /rinoa-storage:/extra-filesystems/rinoa-storage:ro - /dev/nvme0n1:/extra-filesystems/nvme0n1:ro bitwarden: @@ -1093,7 +1093,7 @@ services: depends_on: - swag environment: - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 GID: 1000 BOUNCER_KEY_SWAG: ${CROWDSEC_SWAG_API_KEY} COLLECTIONS: >- @@ -1293,7 +1293,7 @@ services: volumes: - ${DOCKER_VOLUME_CONFIG}/dagu/:/dagu - ${DOCKER_VOLUME_STORAGE}/backups/:/backups - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock dawarich-app: command: bin/dev container_name: dawarich-app @@ -1494,7 +1494,7 @@ services: TASKS: 1 VOLUMES: 1 LOG_LEVEL: debug - image: ghcr.io/tecnativa/docker-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e + image: ghcr.io/tecnativa${DOCKER_VOLUME_CONFIG}-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e networks: default: null ports: @@ -1503,7 +1503,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock dockflare: container_name: dockflare environment: @@ -1577,7 +1577,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro - dockflare_data:/app/data dockpeek: container_name: dockpeek @@ -1975,7 +1975,7 @@ services: restart: always volumes: - ${DOCKER_VOLUME_CONFIG}/gitea/act-runner/config.yaml:/config.yaml - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock gitea-sonarqube-bot: container_name: gitea-sonarqube-bot depends_on: @@ -2095,7 +2095,7 @@ services: guacamole: container_name: guacamole environment: - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 EXTENSIONS: "auth-totp" TZ: ${TZ} image: flcontainers/guacamole:latest@sha256:81a420f386ef8cbb4697208e13ea90f6a10a54619981241bed672e4a41b5f77f @@ -2458,7 +2458,7 @@ services: bind: create_host_path: true - source: ${DOCKER_VOLUME_CONFIG}/invidious/entrypoint/init-invidious-db.sh - target: /docker-entrypoint-initdb.d/init-invidious-db.sh + target: ${DOCKER_VOLUME_CONFIG}-entrypoint-initdb.d/init-invidious-db.sh type: bind bind: create_host_path: true @@ -3432,7 +3432,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro - ${DOCKER_VOLUME_CONFIG}/loggifly/config.yaml:/app/config.yaml # Path to your config file (ignore if you are only using environment variables) maloja: container_name: maloja @@ -4192,8 +4192,8 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock - - nextcloud_aio_mastercontainer:/mnt/docker-aio-config + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock + - nextcloud_aio_mastercontainer:/mnt${DOCKER_VOLUME_CONFIG}-aio-config nocodb: container_name: nocodb depends_on: @@ -4786,7 +4786,7 @@ services: restart: unless-stopped volumes: - portainer-data:/data - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock portchecker-web: container_name: portchecker-web depends_on: @@ -5547,7 +5547,7 @@ services: volumes: - ${DOCKER_VOLUME_CONFIG}/sablier/state:/opt/sablier/state - ${DOCKER_VOLUME_CONFIG}/sablier/custom_themes:/opt/sablier/custom_themes - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock scraparr: container_name: scraparr depends_on: @@ -5836,7 +5836,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock signoz-otel-collector: <<: *signoz-db-depend command: @@ -6088,7 +6088,7 @@ services: depends_on: - soularr environment: - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 PUID: ${PUID} PGID: ${PGID} TZ: ${TZ} @@ -6118,7 +6118,7 @@ services: - ${DOCKER_VOLUME_CONFIG}/soularr/dashboard:/app - ${DOCKER_VOLUME_CONFIG}/soularr:/data - ${DOCKER_VOLUME_CONFIG}/soularr/logs:/data/logs - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro working_dir: /app soulseek: container_name: soulseek @@ -6301,7 +6301,7 @@ services: # - ${DOCKER_VOLUME_CONFIG}/swag/30_http_otel.conf:/etc/nginx/modules/30_http_otel.conf # - ${DOCKER_VOLUME_CONFIG}/swag/opentelemetry_config.toml:/etc/nginx/opentelemetry_config.toml - /rinoa-storage:/storage - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro tandoor: container_name: tandoor-recipes depends_on: @@ -6375,6 +6375,58 @@ services: target: /var/lib/postgresql/data type: volume volume: {} + tdarr: + container_name: tdarr + environment: + TZ: ${TZ} + PUID: ${PUID} + PGID: ${PGID} + UMASK_SET: 002 + serverIP: 0.0.0.0 + serverPort: 8266 + webUIPort: 8265 + internalNode: true + inContainer: true + ffmpegVersion: 7 + nodeName: tdarr-rinoa + auth: true + authSecretKey: ${TDARR_AUTH_SECRET_KEY} + openBrowser: true + maxLogSizeMB: 10 + cronPluginUpdate: + NVIDIA_DRIVER_CAPABILITIES: all + NVIDIA_VISIBLE_DEVICES: all + image: ghcr.io/haveagitgat/tdarr:2.55.01 + labels: + homepage.group: Servarr Stack + homepage.name: Tdarr + homepage.href: https://tdarr.${MY_TLD} + homepage.icon: tdarr.png + homepage.description: Distributed transcode automation + homepage.widget.type: tdarr + homepage.widget.url: http://tdarr:8266 + swag: enable + swag_proto: http + swag_port: 8265 + swag_address: tdarr + swag_url: tdarr.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.parent: Rinoa + swag.uptime-kuma.name: Tdarr + swag.uptime-kuma.monitor.url: https://tdarr.${MY_TLD} + swag.uptime-kuma.monitor.interval: 300 + swag.uptime-kuma.monitor.retryInterval: 60 + swag.uptime-kuma.monitor.maxretries: 5 + ports: + - 8265:8265 + - 8266:8266 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/tdarr/server:/app/server + - ${DOCKER_VOLUME_CONFIG}/tdarr/configs:/app/configs + - ${DOCKER_VOLUME_CONFIG}/tdarr/logs:/app/logs + - ${DOCKER_VOLUME_CONFIG}/tdarr/transcode_cache:/temp + - ${DOCKER_VOLUME_STORAGE}/:/media unmanic: container_name: unmanic environment: @@ -6434,7 +6486,7 @@ services: TZ: ${TZ} UPTIME_KUMA_USERNAME: ${UPTIME_KUMA_USERNAME} UPTIME_KUMA_PASSWORD: ${UPTIME_KUMA_PASSWORD} - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 hostname: Rinoa image: louislam/uptime-kuma:latest@sha256:431fee3be822b04861cf0e35daf4beef6b7cb37391c5f26c3ad6e12ce280fe18 labels: -- 2.52.0 From e751b0eb110d986a3e94b7292b594db79322fe7b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 15 Nov 2025 13:34:22 -0500 Subject: [PATCH 2/9] Adding Tdarr server. --- docker-compose.yml | 90 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 300046d6..ef50fb5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -762,7 +762,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro - /rinoa-storage:/extra-filesystems/rinoa-storage:ro - /dev/nvme0n1:/extra-filesystems/nvme0n1:ro bitwarden: @@ -1093,7 +1093,7 @@ services: depends_on: - swag environment: - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 GID: 1000 BOUNCER_KEY_SWAG: ${CROWDSEC_SWAG_API_KEY} COLLECTIONS: >- @@ -1293,7 +1293,7 @@ services: volumes: - ${DOCKER_VOLUME_CONFIG}/dagu/:/dagu - ${DOCKER_VOLUME_STORAGE}/backups/:/backups - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock dawarich-app: command: bin/dev container_name: dawarich-app @@ -1494,7 +1494,7 @@ services: TASKS: 1 VOLUMES: 1 LOG_LEVEL: debug - image: ghcr.io/tecnativa/docker-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e + image: ghcr.io/tecnativa${DOCKER_VOLUME_CONFIG}-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e networks: default: null ports: @@ -1503,7 +1503,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock dockflare: container_name: dockflare environment: @@ -1577,7 +1577,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro - dockflare_data:/app/data dockpeek: container_name: dockpeek @@ -1975,7 +1975,7 @@ services: restart: always volumes: - ${DOCKER_VOLUME_CONFIG}/gitea/act-runner/config.yaml:/config.yaml - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock gitea-sonarqube-bot: container_name: gitea-sonarqube-bot depends_on: @@ -2095,7 +2095,7 @@ services: guacamole: container_name: guacamole environment: - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 EXTENSIONS: "auth-totp" TZ: ${TZ} image: flcontainers/guacamole:latest@sha256:81a420f386ef8cbb4697208e13ea90f6a10a54619981241bed672e4a41b5f77f @@ -2458,7 +2458,7 @@ services: bind: create_host_path: true - source: ${DOCKER_VOLUME_CONFIG}/invidious/entrypoint/init-invidious-db.sh - target: /docker-entrypoint-initdb.d/init-invidious-db.sh + target: ${DOCKER_VOLUME_CONFIG}-entrypoint-initdb.d/init-invidious-db.sh type: bind bind: create_host_path: true @@ -3432,7 +3432,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro - ${DOCKER_VOLUME_CONFIG}/loggifly/config.yaml:/app/config.yaml # Path to your config file (ignore if you are only using environment variables) maloja: container_name: maloja @@ -4192,8 +4192,8 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock - - nextcloud_aio_mastercontainer:/mnt/docker-aio-config + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock + - nextcloud_aio_mastercontainer:/mnt${DOCKER_VOLUME_CONFIG}-aio-config nocodb: container_name: nocodb depends_on: @@ -4786,7 +4786,7 @@ services: restart: unless-stopped volumes: - portainer-data:/data - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock portchecker-web: container_name: portchecker-web depends_on: @@ -5547,7 +5547,7 @@ services: volumes: - ${DOCKER_VOLUME_CONFIG}/sablier/state:/opt/sablier/state - ${DOCKER_VOLUME_CONFIG}/sablier/custom_themes:/opt/sablier/custom_themes - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock scraparr: container_name: scraparr depends_on: @@ -5836,7 +5836,7 @@ services: profiles: ["rinoa-apps"] restart: unless-stopped volumes: - - /var/run/docker.sock:/var/run/docker.sock + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock signoz-otel-collector: <<: *signoz-db-depend command: @@ -6088,7 +6088,7 @@ services: depends_on: - soularr environment: - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 PUID: ${PUID} PGID: ${PGID} TZ: ${TZ} @@ -6118,7 +6118,7 @@ services: - ${DOCKER_VOLUME_CONFIG}/soularr/dashboard:/app - ${DOCKER_VOLUME_CONFIG}/soularr:/data - ${DOCKER_VOLUME_CONFIG}/soularr/logs:/data/logs - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro working_dir: /app soulseek: container_name: soulseek @@ -6301,7 +6301,7 @@ services: # - ${DOCKER_VOLUME_CONFIG}/swag/30_http_otel.conf:/etc/nginx/modules/30_http_otel.conf # - ${DOCKER_VOLUME_CONFIG}/swag/opentelemetry_config.toml:/etc/nginx/opentelemetry_config.toml - /rinoa-storage:/storage - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run${DOCKER_VOLUME_CONFIG}.sock:/var/run${DOCKER_VOLUME_CONFIG}.sock:ro tandoor: container_name: tandoor-recipes depends_on: @@ -6375,6 +6375,58 @@ services: target: /var/lib/postgresql/data type: volume volume: {} + tdarr: + container_name: tdarr + environment: + TZ: ${TZ} + PUID: ${PUID} + PGID: ${PGID} + UMASK_SET: 002 + serverIP: 0.0.0.0 + serverPort: 8266 + webUIPort: 8265 + internalNode: true + inContainer: true + ffmpegVersion: 7 + nodeName: tdarr-rinoa + auth: true + authSecretKey: ${TDARR_AUTH_SECRET_KEY} + openBrowser: true + maxLogSizeMB: 10 + cronPluginUpdate: + NVIDIA_DRIVER_CAPABILITIES: all + NVIDIA_VISIBLE_DEVICES: all + image: ghcr.io/haveagitgat/tdarr:2.55.01 + labels: + homepage.group: Servarr Stack + homepage.name: Tdarr + homepage.href: https://tdarr.${MY_TLD} + homepage.icon: tdarr.png + homepage.description: Distributed transcode automation + homepage.widget.type: tdarr + homepage.widget.url: http://tdarr:8266 + swag: enable + swag_proto: http + swag_port: 8265 + swag_address: tdarr + swag_url: tdarr.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.parent: Rinoa + swag.uptime-kuma.name: Tdarr + swag.uptime-kuma.monitor.url: https://tdarr.${MY_TLD} + swag.uptime-kuma.monitor.interval: 300 + swag.uptime-kuma.monitor.retryInterval: 60 + swag.uptime-kuma.monitor.maxretries: 5 + ports: + - 8265:8265 + - 8266:8266 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/tdarr/server:/app/server + - ${DOCKER_VOLUME_CONFIG}/tdarr/configs:/app/configs + - ${DOCKER_VOLUME_CONFIG}/tdarr/logs:/app/logs + - ${DOCKER_VOLUME_CONFIG}/tdarr/transcode_cache:/temp + - ${DOCKER_VOLUME_STORAGE}/:/media unmanic: container_name: unmanic environment: @@ -6434,7 +6486,7 @@ services: TZ: ${TZ} UPTIME_KUMA_USERNAME: ${UPTIME_KUMA_USERNAME} UPTIME_KUMA_PASSWORD: ${UPTIME_KUMA_PASSWORD} - DOCKER_HOST: tcp://dockerproxy:2375 + DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 hostname: Rinoa image: louislam/uptime-kuma:latest@sha256:431fee3be822b04861cf0e35daf4beef6b7cb37391c5f26c3ad6e12ce280fe18 labels: -- 2.52.0 From 4f7aa227b50217668c4354001aeb429e2d65a99d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 06:14:40 -0500 Subject: [PATCH 3/9] Pinning Gotify action version. --- .gitea/workflows/renovate-pr-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml index 8e9b9ddd..7c20811c 100644 --- a/.gitea/workflows/renovate-pr-deploy.yml +++ b/.gitea/workflows/renovate-pr-deploy.yml @@ -126,7 +126,7 @@ jobs: password: ${{ secrets.BOT_GITEA_PASSWORD }} - name: Gotify Notification (Start) - uses: eikendev/gotify-action@master + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -164,7 +164,7 @@ jobs: skip-no-healthcheck: "true" - name: Gotify Notification (Finish) - uses: eikendev/gotify-action@master + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" -- 2.52.0 From 7f2c97fe955382aa920bfa20a5ef15dd54582adb Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 09:01:00 -0500 Subject: [PATCH 4/9] Gotify action version. --- .../workflows/pr-cloudflare-docker-deploy.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 91259a28..a3021d47 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -25,7 +25,7 @@ jobs: fetch-depth: 1 - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -41,7 +41,7 @@ jobs: assignee: ${{ github.actor }} - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -63,7 +63,7 @@ jobs: git fetch origin ${{ github.event.pull_request.base.ref }} - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -197,7 +197,7 @@ jobs: password: ${{ secrets.BOT_GITEA_PASSWORD }} - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -244,7 +244,7 @@ jobs: services-log-level: debug - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -287,7 +287,7 @@ jobs: sort > cloudflare_subdomains.txt - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -317,7 +317,7 @@ jobs: done - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -368,7 +368,7 @@ jobs: echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -412,7 +412,7 @@ jobs: password: ${{ secrets.BOT_GITEA_PASSWORD }} - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" @@ -458,7 +458,7 @@ jobs: skip-no-healthcheck: "true" - name: Gotify Notification - uses: https://git.trez.wtf/Trez/gotify-action@main + uses: eikendev/gotify-action@0.0.3 with: gotify_api_base: "${{ secrets.RUNNER_GOTIFY_URL }}" gotify_app_token: "${{ secrets.RUNNER_GOTIFY_TOKEN }}" -- 2.52.0 From 6719e3a7f5f4694b69e54eeca5451966c06c0770 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 09:16:13 -0500 Subject: [PATCH 5/9] Fixing dependencies. --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ef50fb5a..c560f2d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -750,7 +750,9 @@ services: beszel-agent: container_name: beszel-agent depends_on: - - beszel + beszel: + condition: service_started + required: true environment: PORT: 45876 # Do not remove quotes around the key -- 2.52.0 From ad9bcdc4683a687395e4f0911a1fefddcadb598e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 09:20:40 -0500 Subject: [PATCH 6/9] Fixing dependencies again. --- docker-compose.yml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c560f2d0..3f441a1d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -263,11 +263,18 @@ services: APPRISE_STATEFUL_MODE: simple image: lscr.io/linuxserver/apprise-api:latest@sha256:83a67230d071dd424ee004a0e88f35209f29d413ece2db515c4454aa4097c83f labels: - cloudflare.tunnel.enable: true - cloudflare.tunnel.hostname: apprise.${MY_TLD} - cloudflare.tunnel.service: http://apprise:8000 - cloudflare.tunnel.zonename: ${MY_TLD} - cloudflare.tunnel.no_tls_verify: true + swag: enable + swag_proto: http + swag_port: 8008 + swag_address: 192.168.1.254 + swag_url: adgh.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.parent: Rinoa + swag.uptime-kuma.name: AdGuard Home + swag.uptime-kuma.monitor.url: https://adgh.${MY_TLD} + swag.uptime-kuma.monitor.interval: 300 + swag.uptime-kuma.monitor.retryInterval: 60 + swag.uptime-kuma.monitor.maxretries: 5 homepage.group: Infrastructure/App Performance Monitoring homepage.name: Apprise homepage.icon: apprise.png @@ -1093,7 +1100,9 @@ services: crowdsec: container_name: crowdsec depends_on: - - swag + swag: + condition: service_started + required: true environment: DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 GID: 1000 @@ -6068,8 +6077,12 @@ services: soularr: container_name: soularr depends_on: - - lidarr - - soulseek + lidarr: + condition: service_started + required: true + soulseek: + condition: service_started + required: true environment: PUID: ${PUID} PGID: ${PGID} -- 2.52.0 From af378a8e6134a3ad701c353d7997af5194cac4f9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 09:26:13 -0500 Subject: [PATCH 7/9] Last time fixing dependencies... --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f441a1d..1e34793a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6101,7 +6101,8 @@ services: soularr-dashboard: container_name: soularr-dashboard depends_on: - - soularr + soularr: + condition: service_started environment: DOCKER_HOST: tcp:/${DOCKER_VOLUME_CONFIG}proxy:2375 PUID: ${PUID} -- 2.52.0 From 9f7ac2f41c285ebc63bd44035c2a06dc3778fd57 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 09:38:44 -0500 Subject: [PATCH 8/9] Apprise label modifications. --- docker-compose.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e34793a..f85f6201 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -265,20 +265,21 @@ services: labels: swag: enable swag_proto: http - swag_port: 8008 - swag_address: 192.168.1.254 - swag_url: adgh.${MY_TLD} + swag_port: 8000 + swag_auth: authelia + swag_auth_bypass: /status,/notify/,/details,/metrics,/json/urls + swag_url: apprise.${MY_TLD} swag.uptime-kuma.enabled: true swag.uptime-kuma.monitor.parent: Rinoa - swag.uptime-kuma.name: AdGuard Home - swag.uptime-kuma.monitor.url: https://adgh.${MY_TLD} + swag.uptime-kuma.name: Apprise-API + swag.uptime-kuma.monitor.url: https://apprise.${MY_TLD} swag.uptime-kuma.monitor.interval: 300 swag.uptime-kuma.monitor.retryInterval: 60 swag.uptime-kuma.monitor.maxretries: 5 homepage.group: Infrastructure/App Performance Monitoring homepage.name: Apprise homepage.icon: apprise.png - homepage.href: http://192.168.1.254:54995 + homepage.href: https://apprise.${MY_TLD} homepage.description: Multi-channel notification API homepage.widget.type: customapi homepage.widget.headers: "Accept: application/json" -- 2.52.0 From f7b565a541393470f5cc3f6def5290793786c226 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 16 Nov 2025 09:47:30 -0500 Subject: [PATCH 9/9] Really need more caffeine... --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 10 ---------- docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index a3021d47..19e47300 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -213,16 +213,6 @@ jobs: HC_VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} HC_VAULT_SECRETS_PATH: rinoa-docker/env - - name: Check services - env: - DSLIST: ${{ env.DOCKER_SVC_LIST }} - run: | - if [ -z ${DSLIST} ]; then - echo "DOCKER_SVC_LIST=" >> $GITHUB_ENV - else - echo "${DLIST}" - fi - - name: Pre-pull/build service images in parallel continue-on-error: true uses: https://git.trez.wtf/Trez/docker-select-image-pull@main diff --git a/docker-compose.yml b/docker-compose.yml index f85f6201..cee55c77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1506,7 +1506,7 @@ services: TASKS: 1 VOLUMES: 1 LOG_LEVEL: debug - image: ghcr.io/tecnativa${DOCKER_VOLUME_CONFIG}-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e + image: ghcr.io/tecnativa/docker-socket-proxy:latest@sha256:3400c429c5f9e1b21d62130fb93b16e2e772d4fb7695bd52fc2b743800b9fe9e networks: default: null ports: -- 2.52.0