Auto Merge of PR 3 - docker-ovos-misc-modifications_2025-09-01T15-10-07

Merged by Trez.One

.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 }}
@@ -182,6 +182,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Show Docker‑related env vars
+        run: |
+          env | grep '^DOCKER_' || true
+
       - name: Login to Gitea Container Registry
         run: |
           docker login -u gitea-sonarqube-bot -p ${REGISTRY_PASSWORD} git.trez.wtf
@@ -226,7 +230,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 }}
@@ -236,9 +240,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_host: 'docker.io'
-          # registry_user: TrezOne
+          registry_user: ${{ secrets.DOCKER_HUB_USER }}
-          # registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }}
+          registry_pass: ${{ secrets.DOCKER_HUB_PASSWORD }}
           summary: true
 
       - name: Gotify Notification
@@ -337,15 +341,15 @@ jobs:
            echo ${COMPOSE_FILE_LIST}
 
       - name: Docker Compose Deployment
-        uses: cssnr/stack-deploy-action@v1.3.2
+        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
           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

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
@@ -13,7 +10,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:
@@ -51,68 +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
-  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 +58,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 +90,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: