Trez/lunafreya-lva
4
0
Fork 0
Code Issues 1 Pull Requests Actions Activity

[DOCKER] Automated PR for docker-ovos-misc-modifications_2025-09-01T15-10-07 - #5 #5

Merged
gitea-sonarqube-bot merged 4 commits from docker-ovos-misc-modifications_2025-09-01T15-10-07 into main 2025-09-02 07:29:49 -04:00
Conversation 0 Commits 4 Files Changed 3
+64 -58
3 changed files with 64 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/ovos-compose-upstream.yml
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
- name: Sync compose from ovos-docker - name: Sync compose from ovos-docker
run: | run: |
# Make the sync script executable # Make the sync script executable
chmod +x ./update-sync-ovos-compose-compose.sh chmod +x ./update-sync-ovos-compose.sh
# Run the script # Run the script
./update-sync-ovos-compose.sh ./update-sync-ovos-compose.sh
.gitea/workflows/pr-docker-deploy.yml
+8 -2
View File
@@ -156,6 +156,12 @@ jobs:
echo "Detected service changes:" echo "Detected service changes:"
cat service_changes.txt 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/ *$//') mod_svcs=$(cut -d':' -f1 service_changes.txt | sort | uniq | tr '\n' ' ' | sed 's/ *$//')
echo "docker_svc_list<<EOF" >> "$GITHUB_OUTPUT" echo "docker_svc_list<<EOF" >> "$GITHUB_OUTPUT"
echo "$mod_svcs" >> "$GITHUB_OUTPUT" echo "$mod_svcs" >> "$GITHUB_OUTPUT"
@@ -344,12 +350,12 @@ jobs:
uses: cssnr/stack-deploy-action@v1.4.0 uses: cssnr/stack-deploy-action@v1.4.0
with: with:
mode: compose mode: compose
file: '${{ needs.docker-compose-dry-run.outputs.compose_file_list }}' file: ${COMPOSE_FILE_LIST}
name: 'ovosmisc' name: 'ovosmisc'
host: 192.168.1.250 host: 192.168.1.250
user: ovos user: ovos
ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} 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' env_file: '.env'
# registry_host: 'ghcr.io' # registry_host: 'ghcr.io'
# registry_user: TrezOne # registry_user: TrezOne
docker-compose.misc.yml
+55 -55
View File
@@ -1,8 +1,8 @@
name: ovosmisc name: ovosmisc
# x-watchtower-monitor: &watchtower-monitor x-watchtower-monitor: &watchtower-monitor
# labels: labels:
# com.centurylinklabs.watchtower.monitor-only: true com.centurylinklabs.watchtower.monitor-only: true
services: services:
beszel-agent: beszel-agent:
container_name: beszel-agent container_name: beszel-agent
@@ -51,58 +51,58 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
# ovos_audio: ovos_audio:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_cli: ovos_cli:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_core: ovos_core:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_listener: ovos_listener:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_messagebus: ovos_messagebus:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_phal: ovos_phal:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_phal_admin: ovos_phal_admin:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_plugin_ggwave: ovos_plugin_ggwave:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_alerts: ovos_skill_alerts:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_camera: ovos_skill_camera:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_date_time: ovos_skill_date_time:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_duckduckgo: ovos_skill_duckduckgo:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_easter_eggs: ovos_skill_easter_eggs:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_fallback_unknown: ovos_skill_fallback_unknown:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_ggwave: ovos_skill_ggwave:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_hello_world: ovos_skill_hello_world:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_jokes: ovos_skill_jokes:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_parrot: ovos_skill_parrot:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_personal: ovos_skill_personal:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_randomness: ovos_skill_randomness:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_volume: ovos_skill_volume:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_weather: ovos_skill_weather:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_wikihow: ovos_skill_wikihow:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_wikipedia: ovos_skill_wikipedia:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_wolfie: ovos_skill_wolfie:
# <<: *watchtower-monitor <<: *watchtower-monitor
# ovos_skill_wordnet: ovos_skill_wordnet:
# <<: *watchtower-monitor <<: *watchtower-monitor
portainer-agent: portainer-agent:
container_name: portainer_agent container_name: portainer_agent
image: portainer/agent:latest image: portainer/agent:latest