From 0fa8828da96f62602b94eb30dbbef1667f5e7306 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 06:33:47 -0400 Subject: [PATCH 1/2] Added the public key back in and it started working... --- .gitea/workflows/pr-docker-deploy.yml | 2 +- docker-compose.misc.yml | 55 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 2bd9bee..cc16169 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 beszel-agent docker-socket-proxy portainer-agent signoz-logspout watchtower + args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: '.env' # registry_host: 'ghcr.io' # registry_user: TrezOne diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index ad8eec8..362f70a 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -1,5 +1,8 @@ name: ovosmisc +# x-watchtower-monitor: &watchtower-monitor +# labels: +# com.centurylinklabs.watchtower.monitor-only: true services: beszel-agent: container_name: beszel-agent @@ -48,6 +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 portainer-agent: container_name: portainer_agent image: portainer/agent:latest -- 2.52.0 From 6f4d6c727d1f0db3c38853d201c1dfcf10f9e6dc Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 2 Sep 2025 06:47:46 -0400 Subject: [PATCH 2/2] Adding Portracker service. --- .gitea/workflows/pr-docker-deploy.yml | 2 +- docker-compose.misc.yml | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index cc16169..f18871f 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -238,7 +238,7 @@ jobs: host: 192.168.1.250 user: ovos ssh_key: ${{ secrets.BDIKTA_GITEA_PRIVATE_SSH_KEY }} - args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} + args: --remove-orphans --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: '.env' registry_host: 'docker.io' registry_user: ${{ secrets.DOCKER_HUB_USER }} diff --git a/docker-compose.misc.yml b/docker-compose.misc.yml index 362f70a..7795028 100644 --- a/docker-compose.misc.yml +++ b/docker-compose.misc.yml @@ -113,6 +113,25 @@ services: restart: always ports: - 9001:9001 + portracker: + cap_add: + - SYS_PTRACE + - SYS_ADMIN + container_name: portracker + environment: + DATABASE_PATH: /data/portracker.db + DEBUG: false + DOCKER_HOST: tcp://dockerproxy:2375 + PORT: 4999 + image: mostafawahied/portracker:latest + pid: "host" + ports: + - 4999:4999 + restart: unless-stopped + security_opt: + - apparmor:unconfined + volumes: + - portracker-data:/data signoz-logspout: command: signoz://192.168.1.254:8082 container_name: signoz-logspout @@ -153,4 +172,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro volumes: beszel-agent-data: - name: beszel-agent-data \ No newline at end of file + name: beszel-agent-data + portracker-data: + name: portracker-data \ No newline at end of file -- 2.52.0