Local change dump

ai/compose.yml

@@ -1,29 +1,5 @@
 services:
 
-  # webui:
-  #   image: ghcr.io/open-webui/open-webui:main
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
-  #   restart: always
-  #   environment:
-  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
-  #   networks:
-  #     - ai_net
-  #     - ai_backend
-  #   labels:
-  #     - "traefik.enable=true"
-
-  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-http.entrypoints=web"
-  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
-
-  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
-  #     - "traefik.http.routers.webui-https.tls=true"
-  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
-
   hermes:
     build:
       context: ./hermes
@@ -31,12 +7,14 @@ services:
         - default
     container_name: hermes
     entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
+      "bash /usr/local/bin/run-multi-gateways.sh && 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:
+      - HERMES_UID=10000
+      - HERMES_GID=10000
       - OLLAMA_HOST=http://ollama:11434
       - HERMES_DASHBOARD=1
       # Multi-profile: comma-separated list of profiles to run as gateways.
@@ -59,10 +37,7 @@ services:
       - TZ=America/Montreal
     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/telos-ro:/opt/data/telos-ro:ro
-      # Syncthing-shared inbox — write tasks here, they sync to user's laptop
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/opt/data/ExoKortex
     devices:
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
@@ -109,24 +84,29 @@ services:
       - "21027:21027/udp"
     environment:
       - TZ=America/Montreal
+      - PUID=10000
+      - PGID=10000
     volumes:
-      - /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/config:/var/syncthing/config
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/ExoKortex
     networks:
       - ai_backend
       - ai_net
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=ai_net"
+
       - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
       - "traefik.http.routers.syncthing-http.entrypoints=web"
       - "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
+
       - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
       - "traefik.http.routers.syncthing-https.entrypoints=websecure"
       - "traefik.http.routers.syncthing-https.tls=true"
       - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
-      - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
+      - "traefik.http.routers.syncthing-https.middlewares=hermes-auth"
 
+      - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
 
   ollama:
     build:
@@ -203,10 +183,8 @@ services:
       # Service Loadbalancer (nginx port)
       - "traefik.http.services.honcho.loadbalancer.server.port=80"
     depends_on:
-      honcho-db:
-        condition: service_healthy
-      honcho-redis:
-        condition: service_healthy
+      - honcho-db
+      - honcho-redis
 
   honcho-db:
     image: pgvector/pgvector:pg15
@@ -225,11 +203,6 @@ services:
       - ./honcho/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
       - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U honcho -d honcho"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
   honcho-redis:
     image: redis:8
@@ -241,15 +214,10 @@ services:
       - /mnt/HoardingCow_docker_data/Honcho/redis:/data
     networks:
       - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
 networks:
   ai_net:
-    external: true
+    driver: bridge
     name: ai_net
   ai_backend:
     driver: bridge
@@ -257,7 +225,7 @@ networks:
 
 volumes:
   honcho_data:
-    external: true
+    driver: bridge
     name: honcho_data
     
   # llama_cpp_devstral:
@@ -348,6 +316,30 @@ volumes:
   #     - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
   #   restart: unless-stopped
 
+  # webui:
+  #   image: ghcr.io/open-webui/open-webui:main
+  #   volumes:
+  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
+  #   restart: always
+  #   environment:
+  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
+  #   networks:
+  #     - ai_net
+  #     - ai_backend
+  #   labels:
+  #     - "traefik.enable=true"
+
+  #     # Router for HTTP + redirection to HTTPS
+  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-http.entrypoints=web"
+  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
+
+  #     # Router for HTTPS with TLS
+  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
+  #     - "traefik.http.routers.webui-https.tls=true"
+  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
+
   # n8n:
   #   image: n8nio/n8n:latest
   #   container_name: n8n

ai/hermes/Dockerfile

@@ -9,26 +9,6 @@
 # ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
 FROM nousresearch/hermes-agent:latest
 
-# ---------- Overlay our forked source ----------
-# Uses SSH agent forwarding from the build host (no key baked into image).
-# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
-# Only the Python source, web UI source, and config change.
-RUN --mount=type=ssh \
-    mkdir -p /root/.ssh && \
-    ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
-    cd /tmp && \
-    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
-    git clone --depth 1 --branch main \
-    git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
-    rm -rf fork/node_modules fork/.venv fork/.git && \
-    cp -a fork/. /opt/hermes/ && \
-    rm -rf /tmp/fork /root/.ssh/
-
-# ---------- Reinstall Python package (editable) ----------
-# Picks up source changes from our fork.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir --no-deps -e /opt/hermes
-
 # ---------- Extra system deps ----------
 USER root
 RUN apt-get update && \
@@ -43,12 +23,6 @@ RUN apt-get update && \
 # ---------- UV ----------
 COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
 
-# ---------- Matrix bridge + extra pip deps ----------
-# Previously installed inline at container startup and persisted via volume mount.
-# Now baked into the image so the fragile venv volume mount can be removed.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
-
 WORKDIR /opt/hermes
 
 # ---------- Matrix bridge + extra pip deps ----------
@@ -100,4 +74,4 @@ ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
 USER root
 RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
 
-VOLUME [ "/opt/data" ]
+VOLUME [ "/opt/data" ]