From f884f457fbf5f905bf2461800b32517e340414ae Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 18:34:45 -0400 Subject: [PATCH 01/17] Forgot to change version for Docker Compose SSH Deploy. --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index c8e8553..08ca746 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -337,7 +337,7 @@ jobs: echo ${COMPOSE_FILE_LIST} - name: Docker Compose Deployment - uses: cssnr/stack-deploy-action@v1.3.2 + uses: cssnr/stack-deploy-action@files with: mode: compose file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }} -- 2.52.0 From 89816290a5b82f90aebbfd0b8f8936c4768fb870 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 19:18:09 -0400 Subject: [PATCH 02/17] Beszel agent tag. --- docker-compose.misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index d3314eb..a15def2 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -13,7 +13,7 @@ services: HUB_URL: http://192.168.1.254:22220 expose: - 45876 - image: henrygd/beszel-agent + image: henrygd/beszel-agent:latest network_mode: host restart: unless-stopped volumes: -- 2.52.0 From f1b06781871370f4e0f3980feffe83e184cf79d4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 19:19:52 -0400 Subject: [PATCH 03/17] ... --- docker-compose.misc.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index a15def2..469ab7e 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -103,16 +103,6 @@ services: <<: *watchtower-monitor ovos_skill_wordnet: <<: *watchtower-monitor - signoz-logspout: - command: signoz://192.168.1.254:8082 - container_name: signoz-logspout - environment: - ENV: prod - SIGNOZ_LOG_ENDPOINT: http://192.168.1.254:8082 - image: pavanputhra/logspout-signoz - restart: unless-stopped - volumes: - - /var/run/docker.sock:/var/run/docker.sock portainer-agent: container_name: portainer_agent image: portainer/agent:latest @@ -123,6 +113,16 @@ services: restart: always ports: - 9001:9001 + signoz-logspout: + command: signoz://192.168.1.254:8082 + container_name: signoz-logspout + environment: + ENV: prod + SIGNOZ_LOG_ENDPOINT: http://192.168.1.254:8082 + image: pavanputhra/logspout-signoz + restart: unless-stopped + volumes: + - /var/run/docker.sock:/var/run/docker.sock watchtower: container_name: watchtower environment: @@ -145,7 +145,7 @@ services: WATCHTOWER_NOTIFICATION_GOTIFY_TLS_SKIP_VERIFY: true expose: - 8080 - hostname: Rikku + hostname: Benedikta image: ghcr.io/containrrr/watchtower:latest restart: unless-stopped volumes: -- 2.52.0 From d5c0d90c113cff63ded613544b7e9b3ef24a6762 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 19:22:30 -0400 Subject: [PATCH 04/17] Commenting out ovos services in misc. --- docker-compose.misc.yml | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index 469ab7e..8689a4a 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -51,58 +51,58 @@ services: restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock - ovos_audio: - <<: *watchtower-monitor - ovos_cli: - <<: *watchtower-monitor - ovos_core: - <<: *watchtower-monitor - ovos_listener: - <<: *watchtower-monitor - ovos_messagebus: - <<: *watchtower-monitor - ovos_phal: - <<: *watchtower-monitor - ovos_phal_admin: - <<: *watchtower-monitor - ovos_plugin_ggwave: - <<: *watchtower-monitor - ovos_skill_alerts: - <<: *watchtower-monitor - ovos_skill_camera: - <<: *watchtower-monitor - ovos_skill_date_time: - <<: *watchtower-monitor - ovos_skill_duckduckgo: - <<: *watchtower-monitor - ovos_skill_easter_eggs: - <<: *watchtower-monitor - ovos_skill_fallback_unknown: - <<: *watchtower-monitor - ovos_skill_ggwave: - <<: *watchtower-monitor - ovos_skill_hello_world: - <<: *watchtower-monitor - ovos_skill_jokes: - <<: *watchtower-monitor - ovos_skill_parrot: - <<: *watchtower-monitor - ovos_skill_personal: - <<: *watchtower-monitor - ovos_skill_randomness: - <<: *watchtower-monitor - ovos_skill_volume: - <<: *watchtower-monitor - ovos_skill_weather: - <<: *watchtower-monitor - ovos_skill_wikihow: - <<: *watchtower-monitor - ovos_skill_wikipedia: - <<: *watchtower-monitor - ovos_skill_wolfie: - <<: *watchtower-monitor - ovos_skill_wordnet: - <<: *watchtower-monitor + # ovos_audio: + # <<: *watchtower-monitor + # ovos_cli: + # <<: *watchtower-monitor + # ovos_core: + # <<: *watchtower-monitor + # ovos_listener: + # <<: *watchtower-monitor + # ovos_messagebus: + # <<: *watchtower-monitor + # ovos_phal: + # <<: *watchtower-monitor + # ovos_phal_admin: + # <<: *watchtower-monitor + # ovos_plugin_ggwave: + # <<: *watchtower-monitor + # ovos_skill_alerts: + # <<: *watchtower-monitor + # ovos_skill_camera: + # <<: *watchtower-monitor + # ovos_skill_date_time: + # <<: *watchtower-monitor + # ovos_skill_duckduckgo: + # <<: *watchtower-monitor + # ovos_skill_easter_eggs: + # <<: *watchtower-monitor + # ovos_skill_fallback_unknown: + # <<: *watchtower-monitor + # ovos_skill_ggwave: + # <<: *watchtower-monitor + # ovos_skill_hello_world: + # <<: *watchtower-monitor + # ovos_skill_jokes: + # <<: *watchtower-monitor + # ovos_skill_parrot: + # <<: *watchtower-monitor + # ovos_skill_personal: + # <<: *watchtower-monitor + # ovos_skill_randomness: + # <<: *watchtower-monitor + # ovos_skill_volume: + # <<: *watchtower-monitor + # ovos_skill_weather: + # <<: *watchtower-monitor + # ovos_skill_wikihow: + # <<: *watchtower-monitor + # ovos_skill_wikipedia: + # <<: *watchtower-monitor + # ovos_skill_wolfie: + # <<: *watchtower-monitor + # ovos_skill_wordnet: + # <<: *watchtower-monitor portainer-agent: container_name: portainer_agent image: portainer/agent:latest -- 2.52.0 From 74fbe1d29cfae603b1b5ff7df306eada8150f4e2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 20:37:31 -0400 Subject: [PATCH 05/17] Bumping version of Docker Compose SSH action up to v1.4.0. --- .gitea/workflows/pr-docker-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 08ca746..68ed0e1 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -226,7 +226,7 @@ jobs: echo "Compose files: $compose_list" - name: Docker Compose Dry Run - uses: cssnr/stack-deploy-action@files + uses: cssnr/stack-deploy-action@1.4.0 with: mode: compose file: ${{ steps.compose_file_list.outputs.compose_list }} @@ -337,7 +337,7 @@ jobs: echo ${COMPOSE_FILE_LIST} - name: Docker Compose Deployment - uses: cssnr/stack-deploy-action@files + uses: cssnr/stack-deploy-action@v1.4.0 with: mode: compose file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }} -- 2.52.0 From 1de53486fee264174ccc0c307f0369d5c456b8b4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 20:40:45 -0400 Subject: [PATCH 06/17] ... --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 68ed0e1..31e0e40 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -170,7 +170,7 @@ jobs: needs: [generate-service-list] runs-on: ubuntu-latest outputs: - compose_file_list: ${{ steps.compose_file_list.outputs.compose_list }} + compose_file_list: "${{ steps.compose_file_list.outputs.compose_list }}" env: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} -- 2.52.0 From f3d520a5134701971ef0c5609a7fec5186c4a46e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 20:42:07 -0400 Subject: [PATCH 07/17] ... --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 31e0e40..5519cbe 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -226,7 +226,7 @@ jobs: echo "Compose files: $compose_list" - name: Docker Compose Dry Run - uses: cssnr/stack-deploy-action@1.4.0 + uses: cssnr/stack-deploy-action@v1.4.0 with: mode: compose file: ${{ steps.compose_file_list.outputs.compose_list }} -- 2.52.0 From b1724efbcee01f7661681221f30e727521be241c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:28:49 -0400 Subject: [PATCH 08/17] Commenting out Watchtower labels. --- docker-compose.misc.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index 8689a4a..362f70a 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -1,8 +1,8 @@ name: ovosmisc -x-watchtower-monitor: &watchtower-monitor - labels: - com.centurylinklabs.watchtower.monitor-only: true +# x-watchtower-monitor: &watchtower-monitor +# labels: +# com.centurylinklabs.watchtower.monitor-only: true services: beszel-agent: container_name: beszel-agent -- 2.52.0 From f2c8583a55f9a9b1e9464d0c02676223b1c060c7 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:29:10 -0400 Subject: [PATCH 09/17] Adding Docker Hub login for dry run to test. --- .gitea/workflows/pr-docker-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 5519cbe..697a24f 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -236,9 +236,9 @@ jobs: ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: '.env' - # registry_host: 'ghcr.io' - # registry_user: TrezOne - # registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }} + registry_host: 'hub.docker.com' + registry_user: ${{ secrets.DOCKER_HUB_USER }} + registry_pass: ${{ secrets.DOCKER_HUB_PASSWORD }} summary: true - name: Gotify Notification -- 2.52.0 From 1439769acea653c1b9f91d0ed4131dbc628b331d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:34:46 -0400 Subject: [PATCH 10/17] Adding Docker Hub login for dry run to test. --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 697a24f..a7e2b2e 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -236,7 +236,7 @@ jobs: ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: '.env' - registry_host: 'hub.docker.com' + registry_host: 'docker.io' registry_user: ${{ secrets.DOCKER_HUB_USER }} registry_pass: ${{ secrets.DOCKER_HUB_PASSWORD }} summary: true -- 2.52.0 From e1c22e5920bffa085ee6f4578c58b59283383b17 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:44:14 -0400 Subject: [PATCH 11/17] ... --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index a7e2b2e..8c80b0a 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -226,7 +226,7 @@ jobs: echo "Compose files: $compose_list" - name: Docker Compose Dry Run - uses: cssnr/stack-deploy-action@v1.4.0 + uses: cssnr/stack-deploy-action@files with: mode: compose file: ${{ steps.compose_file_list.outputs.compose_list }} -- 2.52.0 From e18b0df80dda4b13916ef8633405945fa022c3f7 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:45:17 -0400 Subject: [PATCH 12/17] ... --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 8c80b0a..a7e2b2e 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -226,7 +226,7 @@ jobs: echo "Compose files: $compose_list" - name: Docker Compose Dry Run - uses: cssnr/stack-deploy-action@files + uses: cssnr/stack-deploy-action@v1.4.0 with: mode: compose file: ${{ steps.compose_file_list.outputs.compose_list }} -- 2.52.0 From a9a73fc2044c08cb481b1a483795557330a880ee Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:50:04 -0400 Subject: [PATCH 13/17] ... --- .gitea/workflows/pr-docker-deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index a7e2b2e..bf5f555 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -182,6 +182,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Dump environment (masked) + run: | + # Print all vars except anything that looks like a credential + env | grep -viE '(PASS|TOKEN|SECRET|KEY|PRIVATE|CERT)' || true + - name: Login to Gitea Container Registry run: | docker login -u gitea-sonarqube-bot -p ${REGISTRY_PASSWORD} git.trez.wtf -- 2.52.0 From 4b91839646657c15068be94e67f02ae5fbf6e3c0 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Sep 2025 22:55:47 -0400 Subject: [PATCH 14/17] ... --- .gitea/workflows/pr-docker-deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index bf5f555..fa2c996 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -182,10 +182,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Dump environment (masked) + - name: Show Docker‑related env vars run: | - # Print all vars except anything that looks like a credential - env | grep -viE '(PASS|TOKEN|SECRET|KEY|PRIVATE|CERT)' || true + env | grep '^DOCKER_' || true - name: Login to Gitea Container Registry run: | -- 2.52.0 From 092919d2add9ff336893949769a5e27a4d569a10 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 05:58:20 -0400 Subject: [PATCH 15/17] Removing OVOS containers from misc.yml. --- docker-compose.misc.yml | 55 ----------------------------------------- 1 file changed, 55 deletions(-) diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index 362f70a..ad8eec8 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -1,8 +1,5 @@ name: ovosmisc -# x-watchtower-monitor: &watchtower-monitor -# labels: -# com.centurylinklabs.watchtower.monitor-only: true services: beszel-agent: container_name: beszel-agent @@ -51,58 +48,6 @@ services: restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock - # ovos_audio: - # <<: *watchtower-monitor - # ovos_cli: - # <<: *watchtower-monitor - # ovos_core: - # <<: *watchtower-monitor - # ovos_listener: - # <<: *watchtower-monitor - # ovos_messagebus: - # <<: *watchtower-monitor - # ovos_phal: - # <<: *watchtower-monitor - # ovos_phal_admin: - # <<: *watchtower-monitor - # ovos_plugin_ggwave: - # <<: *watchtower-monitor - # ovos_skill_alerts: - # <<: *watchtower-monitor - # ovos_skill_camera: - # <<: *watchtower-monitor - # ovos_skill_date_time: - # <<: *watchtower-monitor - # ovos_skill_duckduckgo: - # <<: *watchtower-monitor - # ovos_skill_easter_eggs: - # <<: *watchtower-monitor - # ovos_skill_fallback_unknown: - # <<: *watchtower-monitor - # ovos_skill_ggwave: - # <<: *watchtower-monitor - # ovos_skill_hello_world: - # <<: *watchtower-monitor - # ovos_skill_jokes: - # <<: *watchtower-monitor - # ovos_skill_parrot: - # <<: *watchtower-monitor - # ovos_skill_personal: - # <<: *watchtower-monitor - # ovos_skill_randomness: - # <<: *watchtower-monitor - # ovos_skill_volume: - # <<: *watchtower-monitor - # ovos_skill_weather: - # <<: *watchtower-monitor - # ovos_skill_wikihow: - # <<: *watchtower-monitor - # ovos_skill_wikipedia: - # <<: *watchtower-monitor - # ovos_skill_wolfie: - # <<: *watchtower-monitor - # ovos_skill_wordnet: - # <<: *watchtower-monitor portainer-agent: container_name: portainer_agent image: portainer/agent:latest -- 2.52.0 From 6d3abad1c55632d5b229f51fae7e08ec572cc287 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 06:15:40 -0400 Subject: [PATCH 16/17] Hard-coding services in dry run step for testing. --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index fa2c996..b7ae5d0 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -349,7 +349,7 @@ jobs: host: 192.168.1.250 user: ovos ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} - args: --remove-orphans -d ${{ needs.generate-service-list.outputs.svc_deploy_list }} + args: --remove-orphans -d beszel-agent docker-socket-proxy portainer-agent signoz-logspout watchtower env_file: '.env' # registry_host: 'ghcr.io' # registry_user: TrezOne -- 2.52.0 From c383a20c68293a57f69d6bd36c5be67b286daa53 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 06:17:36 -0400 Subject: [PATCH 17/17] Hard-coding services in dry run step for testing. --- .gitea/workflows/pr-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index b7ae5d0..2bd9bee 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -344,7 +344,7 @@ jobs: uses: cssnr/stack-deploy-action@v1.4.0 with: mode: compose - file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }} + file: '${{ needs.docker-compose-dry-run.outputs.compose_file_list }}' name: 'ovosmisc' host: 192.168.1.250 user: ovos -- 2.52.0