From 3cb947a4c03f3a8b15dddb9d95b21c31984f18ca Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Dec 2025 19:40:26 -0500 Subject: [PATCH 1/4] Updating workflow to exclude RPi-related configs. --- .gitea/workflows/pr-docker-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index 1f09988..baa404d 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -206,6 +206,7 @@ jobs: -a ! -name "*macos*" \ -a ! -name "*hivemind*" \ -a ! -name "*server*" \ + -a ! -name "*raspberrypi*" \ | sed -e ':a;N;$!ba;s/[\r\n]/ /g') echo "compose_list=$compose_list" >> "$GITHUB_OUTPUT" -- 2.52.0 From b3ba6a7a9ba153ef3944e262aa9214ee00b55043 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Dec 2025 19:40:26 -0500 Subject: [PATCH 2/4] Redoing Hivemind CLI and Listener. --- docker-compose.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 382e3a2..9cca8e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,6 +50,45 @@ services: restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock + hivemind_cli: + container_name: hivemind_cli + hostname: hivemind_cli + restart: unless-stopped + image: docker.io/smartgic/hivemind-cli:alpha + pull_policy: always + tty: true + environment: + TZ: ${TZ} + network_mode: host + volumes: + - ${ULTIMA_DOCKER_DIR}/hivemind/config:/home/${HIVEMIND_USER}/.config/hivemind:z + - ${ULTIMA_DOCKER_DIR}/hivemind/share:/home/${HIVEMIND_USER}/.local/share/hivemind:z + depends_on: + - hivemind_listener + hivemind_listener: + container_name: hivemind_listener + hostname: hivemind_listener + restart: unless-stopped + image: docker.io/smartgic/hivemind-listener:alpha + pull_policy: ${PULL_POLICY:-always} + tty: true + environment: + TZ: ${TZ} + ports: + - 5678:5678 + network_mode: host + volumes: + - ${HIVEMIND_CONFIG_FOLDER}:/home/${HIVEMIND_USER}/.config/hivemind:z + - ${HIVEMIND_SHARE_FOLDER}:/home/${HIVEMIND_USER}/.local/share/hivemind:z + depends_on: + ovos_core: + condition: service_started + healthcheck: + test: ["CMD", "pgrep", "-f", "hivemind-listener"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 15s meilisearch: container_name: meilisearch environment: -- 2.52.0 From 79336c73f0f93ab6be2bed6c1e1078e37763ac67 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Dec 2025 19:54:39 -0500 Subject: [PATCH 3/4] Correcting username.... --- .gitea/workflows/pr-docker-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index baa404d..e0021ce 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -228,7 +228,7 @@ jobs: file: ${{ steps.compose_file_list.outputs.compose_list }} name: "ultima" host: 192.168.1.248 - user: ovos + user: charish ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }} args: --remove-orphans --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: ".env" @@ -349,7 +349,7 @@ jobs: file: ${{ needs.docker-compose-dry-run.outputs.compose_file_list }} name: "ultima" host: 192.168.1.248 - user: ovos + user: charish ssh_key: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }} args: --remove-orphans ${{ needs.generate-service-list.outputs.svc_deploy_list }} env_file: ".env" -- 2.52.0 From f8a9f14b0ce5b81662c5dcc23ffc74f00b64bc80 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 1 Dec 2025 20:04:23 -0500 Subject: [PATCH 4/4] Submodules... --- .gitea/workflows/pr-docker-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml index e0021ce..07089c2 100644 --- a/.gitea/workflows/pr-docker-deploy.yml +++ b/.gitea/workflows/pr-docker-deploy.yml @@ -162,6 +162,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 + with: + submodules: true - name: Login to Docker Hub uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 @@ -298,6 +300,7 @@ jobs: uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: ref: main + submodules: true - name: Login to Docker Hub uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 -- 2.52.0