From 8ed56d896f1a940f11b4745a89322c7e744cbd60 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 07:10:51 -0400 Subject: [PATCH 1/4] Docker Deployment step fix. --- .gitea/workflows/ovos-compose-upstream.yml | 2 +- .gitea/workflows/pr-docker-deploy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ovos-compose-upstream.yml b/.gitea/workflows/ovos-compose-upstream.yml index b9ef923..da75970 100644 --- a/.gitea/workflows/ovos-compose-upstream.yml +++ b/.gitea/workflows/ovos-compose-upstream.yml @@ -17,7 +17,7 @@ jobs: - name: Sync compose from ovos-docker run: | # Make the sync script executable - chmod +x ./update-sync-ovos-compose-compose.sh + chmod +x ./update-sync-ovos-compose.sh # Run the script ./update-sync-ovos-compose.sh diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index f18871f..7c03719 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -344,12 +344,12 @@ jobs: uses: cssnr/stack-deploy-action@v1.4.0 with: mode: compose - file: '${{ needs.docker-compose-dry-run.outputs.compose_file_list }}' + file: ${COMPOSE_FILE_LIST} name: 'ovosmisc' host: 192.168.1.250 user: ovos ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} - args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }} + args: --remove-orphans ${DOCKER_SVC_LIST} env_file: '.env' # registry_host: 'ghcr.io' # registry_user: TrezOne -- 2.52.0 From f0d568bfc5ffa0d7b533e50bdaa554922a32e94a Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 07:15:47 -0400 Subject: [PATCH 2/4] =?UTF-8?q?...=20=F0=9F=8D=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.misc.yml | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index 7795028..d6a42a1 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 @@ -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 06e00a057e738be89481bb9612e7c3e96bf8cd6c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 07:25:58 -0400 Subject: [PATCH 3/4] Testing out a theory with the Docker Compose deploy action... --- .gitea/workflows/pr-docker-deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 7c03719..787d187 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -156,6 +156,12 @@ jobs: echo "Detected service changes:" cat service_changes.txt + if [[ -z service_changes.txt ]]; then + echo "watchtower" > service_changes.txt + echo "Placeholder:" + cat service_changes.txt + fi + mod_svcs=$(cut -d':' -f1 service_changes.txt | sort | uniq | tr '\n' ' ' | sed 's/ *$//') echo "docker_svc_list<> "$GITHUB_OUTPUT" echo "$mod_svcs" >> "$GITHUB_OUTPUT" -- 2.52.0 From 2c06b9505490f078c2044cb19e052b608c141c4f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 07:28:02 -0400 Subject: [PATCH 4/4] Testing out a theory with the Docker Compose deploy action... --- .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 787d187..6a19926 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -156,7 +156,7 @@ jobs: echo "Detected service changes:" cat service_changes.txt - if [[ -z service_changes.txt ]]; then + if [[ -z $(cat service_changes.txt) ]]; then echo "watchtower" > service_changes.txt echo "Placeholder:" cat service_changes.txt -- 2.52.0