Compare commits
4 Commits
feat/herme
...
fix/matrix
| Author | SHA1 | Date | |
|---|---|---|---|
| 8adbbf0ed4 | |||
| ebad994d60 | |||
| 5f25c87775 | |||
| 4e566b2408 |
105
ai/compose.yml
Executable file → Normal file
105
ai/compose.yml
Executable file → Normal file
@@ -31,20 +31,33 @@ services:
|
|||||||
ssh:
|
ssh:
|
||||||
- default
|
- default
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
|
# Install Matrix bridge deps (mautrix[encryption]) + openai into the venv at startup.
|
||||||
|
# Ensures the venv is usable even on first boot with empty persistent volume.
|
||||||
entrypoint: ["/bin/bash", "-c",
|
entrypoint: ["/bin/bash", "-c",
|
||||||
"bash /opt/data/hermes-tools/install.sh && /opt/hermes/.venv/bin/uv pip install openai mautrix[encryption] --system -q && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
"bash /opt/data/hermes-tools/install.sh && \
|
||||||
|
if [ ! -f /opt/hermes/.venv/bin/python3 ]; then \
|
||||||
|
uv venv /opt/hermes/.venv --seed && \
|
||||||
|
. /opt/hermes/.venv/bin/activate && \
|
||||||
|
uv pip install --no-cache-dir --no-deps -e /opt/hermes && \
|
||||||
|
uv pip install --no-cache-dir piper-tts sounddevice numpy; \
|
||||||
|
else \
|
||||||
|
. /opt/hermes/.venv/bin/activate; \
|
||||||
|
fi && \
|
||||||
|
uv pip install openai 'mautrix[encryption]' -q && \
|
||||||
|
exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||||
"hermes-entrypoint"]
|
"hermes-entrypoint"]
|
||||||
restart: always
|
restart: always
|
||||||
# Gateway run enables the internal API server on port 8642
|
# Gateway run enables the internal API server on port 8642
|
||||||
command: gateway run
|
command: gateway run
|
||||||
environment:
|
environment:
|
||||||
- OLLAMA_HOST=http://ollama:11434
|
- OLLAMA_HOST=http://ollama:11434
|
||||||
|
- HERMES_DASHBOARD=1
|
||||||
- API_SERVER_ENABLED=true
|
- API_SERVER_ENABLED=true
|
||||||
- API_SERVER_PORT=8642
|
- API_SERVER_PORT=8642
|
||||||
- API_SERVER_HOST=0.0.0.0
|
- API_SERVER_HOST=0.0.0.0
|
||||||
- API_SERVER_KEY=hermes_local_key
|
- API_SERVER_KEY=hermes_local_key
|
||||||
- GATEWAY_ALLOW_ALL_USERS=true
|
- GATEWAY_ALLOW_ALL_USERS=true
|
||||||
- OPENROUTER_API_KEY=${OPEN...KEY}
|
- OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
|
||||||
# ROCm for GPU-accelerated faster-whisper STT
|
# ROCm for GPU-accelerated faster-whisper STT
|
||||||
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
||||||
- HCC_AMDGPU_TARGET=gfx906
|
- HCC_AMDGPU_TARGET=gfx906
|
||||||
@@ -58,7 +71,7 @@ services:
|
|||||||
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-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
|
# 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/Syncthing/telos-rw:/opt/data/telos-rw:rw
|
||||||
# Persistent venv — Matrix bridge and other pip deps survive container rebuilds
|
# Persist Python venv across container recreation (Matrix bridge deps, etc.)
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
|
- /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
|
||||||
devices:
|
devices:
|
||||||
- /dev/kfd:/dev/kfd
|
- /dev/kfd:/dev/kfd
|
||||||
@@ -68,6 +81,30 @@ services:
|
|||||||
- "26"
|
- "26"
|
||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
|
- ai_net
|
||||||
|
labels:
|
||||||
|
- "traefik.enable=true"
|
||||||
|
- "traefik.docker.network=ai_net"
|
||||||
|
|
||||||
|
# Router for HTTP + redirection to HTTPS
|
||||||
|
- "traefik.http.routers.hermes-web-http.rule=Host(`hermes.lazyworkhorse.net`)"
|
||||||
|
- "traefik.http.routers.hermes-web-http.entrypoints=web"
|
||||||
|
- "traefik.http.routers.hermes-web-http.middlewares=redirect-to-https"
|
||||||
|
|
||||||
|
# Router for HTTPS with TLS — protected by Authelia
|
||||||
|
- "traefik.http.routers.hermes-web-https.rule=Host(`hermes.lazyworkhorse.net`)"
|
||||||
|
- "traefik.http.routers.hermes-web-https.entrypoints=websecure"
|
||||||
|
- "traefik.http.routers.hermes-web-https.tls=true"
|
||||||
|
- "traefik.http.routers.hermes-web-https.tls.certresolver=njalla"
|
||||||
|
- "traefik.http.routers.hermes-web-https.middlewares=hermes-auth"
|
||||||
|
|
||||||
|
# Authelia forwardAuth
|
||||||
|
- "traefik.http.middlewares.hermes-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
|
||||||
|
- "traefik.http.middlewares.hermes-auth.forwardauth.trustforwardheader=true"
|
||||||
|
- "traefik.http.middlewares.hermes-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
|
||||||
|
|
||||||
|
# Service Loadbalancer (dashboard port 9119)
|
||||||
|
- "traefik.http.services.hermes-web.loadbalancer.server.port=9119"
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: syncthing/syncthing:latest
|
image: syncthing/syncthing:latest
|
||||||
@@ -131,62 +168,6 @@ services:
|
|||||||
- "303"
|
- "303"
|
||||||
- "26"
|
- "26"
|
||||||
|
|
||||||
paperclip-db:
|
|
||||||
image: postgres:17-alpine
|
|
||||||
container_name: paperclip-db
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: paperclip
|
|
||||||
POSTGRES_PASSWORD: ${PAPERCLIP_DB_PASSWORD:?PAPERCLIP_DB_PASSWORD must be set}
|
|
||||||
POSTGRES_DB: paperclip
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U paperclip -d paperclip"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/pgdata:/var/lib/postgresql/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
|
|
||||||
paperclip:
|
|
||||||
image: ghcr.io/paperclipai/paperclip:v2026.517.0
|
|
||||||
container_name: paperclip
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:3100:3100"
|
|
||||||
environment:
|
|
||||||
- HOST=0.0.0.0
|
|
||||||
- PORT=3100
|
|
||||||
- SERVE_UI=true
|
|
||||||
- DATABASE_URL=postgres://paperclip:***@paperclip-db:5432/paperclip
|
|
||||||
- BETTER_AUTH_SECRET=${PAPE...CRET must be set}
|
|
||||||
- PAPERCLIP_PUBLIC_URL=https://paperclip.lazyworkhorse.net
|
|
||||||
- PAPERCLIP_DEPLOYMENT_MODE=authenticated
|
|
||||||
- PAPERCLIP_DEPLOYMENT_EXPOSURE=private
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/data:/paperclip
|
|
||||||
depends_on:
|
|
||||||
paperclip-db:
|
|
||||||
condition: service_healthy
|
|
||||||
networks:
|
|
||||||
- ai_net
|
|
||||||
- ai_backend
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.docker.network=ai_net"
|
|
||||||
|
|
||||||
- "traefik.http.routers.paperclip-http.rule=Host(`paperclip.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.paperclip-http.entrypoints=web"
|
|
||||||
- "traefik.http.routers.paperclip-http.middlewares=redirect-to-https"
|
|
||||||
|
|
||||||
- "traefik.http.routers.paperclip-https.rule=Host(`paperclip.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.paperclip-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.paperclip-https.tls=true"
|
|
||||||
- "traefik.http.routers.paperclip-https.tls.certresolver=njalla"
|
|
||||||
|
|
||||||
- "traefik.http.services.paperclip.loadbalancer.server.port=3100"
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
external: true
|
external: true
|
||||||
@@ -338,8 +319,8 @@ networks:
|
|||||||
# - /home/gortium/infra:/data/workspace/infra
|
# - /home/gortium/infra:/data/workspace/infra
|
||||||
# environment:
|
# environment:
|
||||||
# - TZ=America/Toronto
|
# - TZ=America/Toronto
|
||||||
# - OPENCLAW_GATEWAY_TOKEN=${OPEN...KEN}
|
# - OPENCLAW_GATEWAY_TOKEN=${OPENCLAW_GATEWAY_TOKEN}
|
||||||
# - OPENROUTER_API_KEY=${OPEN...KEY}
|
# - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
|
||||||
# # Point to the sidecar browser
|
# # Point to the sidecar browser
|
||||||
# - BROWSER_CDP_URL=http://openclaw-browser:9222
|
# - BROWSER_CDP_URL=http://openclaw-browser:9222
|
||||||
# - BROWSER_EVALUATE_ENABLED=true
|
# - BROWSER_EVALUATE_ENABLED=true
|
||||||
@@ -384,7 +365,7 @@ networks:
|
|||||||
# - PGID=1000
|
# - PGID=1000
|
||||||
# - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
|
# - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
|
||||||
# - SUDO_ACCESS=false
|
# - SUDO_ACCESS=false
|
||||||
# - PASSWORD_ACCESS=***
|
# - PASSWORD_ACCESS=false
|
||||||
# volumes:
|
# volumes:
|
||||||
# - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
|
# - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
|
||||||
# - /home/gortium/infra:/data/workspace/infra:ro
|
# - /home/gortium/infra:/data/workspace/infra:ro
|
||||||
|
|||||||
@@ -9,8 +9,6 @@
|
|||||||
# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
|
# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
|
||||||
FROM nousresearch/hermes-agent:latest
|
FROM nousresearch/hermes-agent:latest
|
||||||
|
|
||||||
WORKDIR /opt/hermes
|
|
||||||
|
|
||||||
# ---------- Overlay our forked source ----------
|
# ---------- Overlay our forked source ----------
|
||||||
# Uses SSH agent forwarding from the build host (no key baked into image).
|
# 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.
|
# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
|
||||||
@@ -22,16 +20,10 @@ RUN --mount=type=ssh \
|
|||||||
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
||||||
git clone --depth 1 --branch main \
|
git clone --depth 1 --branch main \
|
||||||
git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
|
git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
|
||||||
rsync -a --delete fork/ /opt/hermes/ \
|
rm -rf fork/node_modules fork/.venv fork/.git && \
|
||||||
--exclude node_modules \
|
cp -a fork/. /opt/hermes/ && \
|
||||||
--exclude .venv \
|
|
||||||
--exclude .git && \
|
|
||||||
rm -rf /tmp/fork /root/.ssh/
|
rm -rf /tmp/fork /root/.ssh/
|
||||||
|
|
||||||
# ---------- Rebuild web UI ----------
|
|
||||||
# Source files changed; node_modules (from base image) reused.
|
|
||||||
RUN cd /opt/hermes && npm run build
|
|
||||||
|
|
||||||
# ---------- Reinstall Python package (editable) ----------
|
# ---------- Reinstall Python package (editable) ----------
|
||||||
# Picks up source changes from our fork.
|
# Picks up source changes from our fork.
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
@@ -52,7 +44,7 @@ COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
|||||||
|
|
||||||
# ---------- Piper TTS ----------
|
# ---------- Piper TTS ----------
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
uv pip install --no-cache-dir piper-tts sounddevice numpy httpx && \
|
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
||||||
mkdir -p /opt/hermes/.venv/share/piper/voices
|
mkdir -p /opt/hermes/.venv/share/piper/voices
|
||||||
|
|
||||||
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
@@ -77,10 +69,6 @@ os.remove(tgz)
|
|||||||
print('himalaya v1.2.0 installed')
|
print('himalaya v1.2.0 installed')
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
# ---------- Install himalaya-ro wrapper ----------
|
|
||||||
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
@@ -90,6 +78,7 @@ ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
|||||||
|
|
||||||
# Ensure tools directory and toolsets.py are writable by the hermes runtime user
|
# Ensure tools directory and toolsets.py are writable by the hermes runtime user
|
||||||
# so custom tools can be injected from the persistent volume at startup.
|
# so custom tools can be injected from the persistent volume at startup.
|
||||||
|
USER root
|
||||||
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
||||||
|
|
||||||
VOLUME [ "/opt/data" ]
|
VOLUME [ "/opt/data" ]
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# ─────────────────────────────────────────────────────────────
|
|
||||||
# himalaya-ro — Read-only wrapper for himalaya
|
|
||||||
#
|
|
||||||
# Blocks destructive commands and logs audit trail.
|
|
||||||
# Pass-through for read-only commands (list, read, search).
|
|
||||||
#
|
|
||||||
# Usage: himalaya-ro [options] <command> [args...]
|
|
||||||
#
|
|
||||||
# Install: place in PATH before the real himalaya, or use
|
|
||||||
# `ln -sf himalaya-ro /usr/local/bin/himalaya`
|
|
||||||
# ─────────────────────────────────────────────────────────────
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
# ── Configuration ───────────────────────────────────────────
|
|
||||||
HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
|
|
||||||
AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
|
|
||||||
|
|
||||||
# ── Destructive commands we block ──────────────────────────
|
|
||||||
BLOCKED_CMDS=(
|
|
||||||
"message move"
|
|
||||||
"message delete"
|
|
||||||
"message copy"
|
|
||||||
"flag add"
|
|
||||||
"flag remove"
|
|
||||||
"folder create"
|
|
||||||
"folder delete"
|
|
||||||
"folder rename"
|
|
||||||
"template send"
|
|
||||||
"account configure"
|
|
||||||
"account delete"
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── Determine the subcommand being invoked ─────────────────
|
|
||||||
# Strip leading options (--account, --output, etc.) to find the verb
|
|
||||||
ARGS=()
|
|
||||||
SKIP_NEXT=false
|
|
||||||
for arg in "$@"; do
|
|
||||||
if $SKIP_NEXT; then
|
|
||||||
SKIP_NEXT=false
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
if [[ "$arg" == --* ]]; then
|
|
||||||
case "$arg" in
|
|
||||||
--account|--output|--page|--page-size|--folder|--color|--format)
|
|
||||||
SKIP_NEXT=true ;;
|
|
||||||
esac
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
ARGS+=("$arg")
|
|
||||||
done
|
|
||||||
|
|
||||||
# Build subcommand string and check against blocklist
|
|
||||||
CMD_STR=""
|
|
||||||
for ((i=0; i<${#ARGS[@]}; i++)); do
|
|
||||||
if [ -z "$CMD_STR" ]; then
|
|
||||||
CMD_STR="${ARGS[$i]}"
|
|
||||||
else
|
|
||||||
CMD_STR="$CMD_STR ${ARGS[$i]}"
|
|
||||||
fi
|
|
||||||
for blocked in "${BLOCKED_CMDS[@]}"; do
|
|
||||||
if [[ "$CMD_STR" == "$blocked" ]]; then
|
|
||||||
TS=$(date '+%Y-%m-%d %H:%M:%S')
|
|
||||||
echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
|
|
||||||
echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
|
|
||||||
echo " Audit log: $AUDIT_LOG" >&2
|
|
||||||
exit 100
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
# ── Allow pass-through ─────────────────────────────────────
|
|
||||||
exec "$HIMALAYA_BIN" "$@"
|
|
||||||
4
ai/hermes/startup.sh
Executable file
4
ai/hermes/startup.sh
Executable file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# This file was replaced by inline entrypoint logic in compose.yml
|
||||||
|
# See ai/compose.yml hermes.entrypoint for the current implementation.
|
||||||
|
echo "startup.sh is obsolete — logic is inline in compose.yml entrypoint"
|
||||||
Reference in New Issue
Block a user