.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
 

.gitea/workflows/pr-docker-deploy.yml

@@ -156,6 +156,12 @@ jobs:
           echo "Detected service changes:"
           cat service_changes.txt
 
+          if [[ -z $(cat 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<<EOF" >> "$GITHUB_OUTPUT"
           echo "$mod_svcs" >> "$GITHUB_OUTPUT"
@@ -344,12 +350,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

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