Merge master into fix/matrix-bridge-dependencies to resolve conflicts

Merge pull request #2 : fix: Matrix bridge ModuleNotFoundError - install deps to venv with persistence
# Conflicts: # ai/compose.yml
2026-05-20 14:42:02 -04:00 · 2026-05-20 14:41:06 -04:00 · 2026-05-19 00:28:59 +00:00 · 2026-05-18 20:25:18 -04:00 · 2026-05-14 22:24:19 -04:00 · 2026-05-13 13:11:11 -04:00
2 changed files with 7 additions and 10 deletions
--- a/ai/compose.yml
+++ b/ai/compose.yml
@@ -32,11 +32,9 @@ services:
        - default
    container_name: hermes
    entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
+      "bash /opt/data/hermes-tools/install.sh && . /opt/hermes/.venv/bin/activate && uv pip install openai 'mautrix[encryption]' -q && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
      "hermes-entrypoint"]
    restart: always
-    # Gateway run enables the internal API server on port 8642
-    command: gateway run
    environment:
      - OLLAMA_HOST=http://ollama:11434
      - API_SERVER_ENABLED=true
@@ -55,9 +53,11 @@ services:
    volumes:
      - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
      # Syncthing-shared org files — read-only view of user's agenda
-      - /mnt/HoardingCow_docker_data/Syncthing/org-ro:/opt/data/org-ro:ro
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
      # Syncthing-shared inbox — write tasks here, they sync to user's laptop
-      - /mnt/HoardingCow_docker_data/Syncthing/org-rw:/opt/data/org-rw:rw
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
+      # Persist Python venv across container recreation (Matrix bridge deps, etc.)
+      - /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
    devices:
      - /dev/kfd:/dev/kfd
      - /dev/dri:/dev/dri
@@ -80,8 +80,8 @@ services:
      - TZ=America/Montreal
    volumes:
      - /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
-      - /mnt/HoardingCow_docker_data/Syncthing/org-ro:/org-ro
-      - /mnt/HoardingCow_docker_data/Syncthing/org-rw:/org-rw
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
    networks:
      - ai_backend
      - ai_net
--- a/versioncontrol/compose.yml
+++ b/versioncontrol/compose.yml
@@ -8,13 +8,10 @@ services:
      - USER_GID=1000
      - GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
      - GITEA__actions__ENABLED=true
-      - GITEA__actions__DEFAULT_ACTIONS_URL=off
      - SSH_PORT=2222
      - SSH_LISTEN_PORT=2222
      # Enable Gitea Actions (act_runner required on host)
      - GITEA__actions__ENABLED=true
-      # Don't fetch actions from GitHub (offline mode + local only)
-      - GITEA__actions__DEFAULT_ACTIONS_URL=off
    volumes:
      - /mnt/HoardingCow_docker_data/Gitea:/data
    networks:
Author	SHA1	Message	Date
Hermes	2ff99b1f57	Merge master into fix/matrix-bridge-dependencies to resolve conflicts Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details	2026-05-20 14:42:02 -04:00
Hermes	dea1429a5d	Merge pull request #2 : fix: Matrix bridge ModuleNotFoundError - install deps to venv with persistence # Conflicts: # ai/compose.yml	2026-05-20 14:41:06 -04:00
Thierry Pouplier	d3f2e3b7b9	Merge pull request 'feat: add Syncthing service for Hermes org-file sync' (#30 ) from feat/syncthing-org-sync into master Some checks failed Build Hermes agent / build (push) Has been cancelled Details Build ollama (gfx906) / build (push) Has been cancelled Details Reviewed-on: #30	2026-05-19 00:28:59 +00:00
Thierry Pouplier	6a44120b1a	Fixed syncthing dir path Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details	2026-05-18 20:25:18 -04:00
Thierry Pouplier	38a1451689	Merge branch 'master' into feat/syncthing-org-sync	2026-05-14 22:24:19 -04:00
Thierry Pouplier	8d1ae7e632	Remove the unsuported gitea action off	2026-05-13 13:11:11 -04:00
Thierry Pouplier	2aab06cc1a	fix: use mautrix[encryption] instead of matrix-nio for Matrix bridge The Hermes Matrix gateway uses the mautrix SDK, not matrix-nio. This fixes E2EE support by installing the correct library. Refs: PR #2	2026-04-29 03:34:15 +00:00
Thierry Pouplier	a404f5e2c4	fix: Correct OPENROUTER_API_KEY variable name	2026-04-29 02:43:35 +00:00
Thierry Pouplier	f9afd79f3e	fix: Add openai and matrix-nio dependencies for Hermes Matrix bridge	2026-04-29 02:19:24 +00:00