Compare commits
2 Commits
feat/herme
...
feat/act-r
| Author | SHA1 | Date | |
|---|---|---|---|
| 670a2c47a1 | |||
| 946ebb2957 |
@@ -26,14 +26,8 @@ services:
|
|||||||
# - "traefik.http.routers.webui-https.tls.certresolver=njalla"
|
# - "traefik.http.routers.webui-https.tls.certresolver=njalla"
|
||||||
|
|
||||||
hermes:
|
hermes:
|
||||||
build:
|
build: ./hermes
|
||||||
context: ./hermes
|
|
||||||
ssh:
|
|
||||||
- default
|
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
entrypoint: ["/bin/bash", "-c",
|
|
||||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
|
||||||
"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
|
||||||
@@ -54,10 +48,6 @@ services:
|
|||||||
- TZ=America/Montreal
|
- TZ=America/Montreal
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
- /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
|
|
||||||
devices:
|
devices:
|
||||||
- /dev/kfd:/dev/kfd
|
- /dev/kfd:/dev/kfd
|
||||||
- /dev/dri:/dev/dri
|
- /dev/dri:/dev/dri
|
||||||
@@ -67,35 +57,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
|
|
||||||
syncthing:
|
|
||||||
image: syncthing/syncthing:latest
|
|
||||||
container_name: syncthing
|
|
||||||
hostname: syncthing
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- "8384:8384"
|
|
||||||
- "22000:22000"
|
|
||||||
- "21027:21027/udp"
|
|
||||||
environment:
|
|
||||||
- TZ=America/Montreal
|
|
||||||
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
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
- ai_net
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "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"
|
|
||||||
|
|
||||||
ollama:
|
ollama:
|
||||||
build:
|
build:
|
||||||
context: ./ollama
|
context: ./ollama
|
||||||
|
|||||||
@@ -1,106 +1,73 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# 1. On récupère la version la plus récente d'UV
|
||||||
# Hermes Agent with Chromium -- local browser tool support
|
FROM ghcr.io/astral-sh/uv:latest AS uv_source
|
||||||
# Based on python:3.11-slim for minimal footprint.
|
|
||||||
# Chromium installed via apt-get for system-level browser automation.
|
# 2. Image officielle Hermes Agent de NousResearch
|
||||||
|
# Contient déjà: Python, Node.js, npm, Playwright/Chromium, venv, tts_tool.py, etc.
|
||||||
|
FROM nousresearch/hermes-agent:latest
|
||||||
|
|
||||||
|
# ---------- System dependencies ----------
|
||||||
|
# The official hermes-agent image already has: git, curl, ffmpeg, python3,
|
||||||
|
# gcc, build-essential, openssh-client, procps, tini, ripgrep, docker-cli,
|
||||||
|
# libportaudio2, ca-certificates, etc.
|
||||||
#
|
#
|
||||||
# Build:
|
# These extras we need to add back:
|
||||||
# docker build -t hermes-agent:chromium .
|
# - poppler-utils, imagemagick (PDF/image processing)
|
||||||
#
|
# - texlive-* (LaTeX typesetting for reports)
|
||||||
# Environment variables:
|
# - qemu-user-static, binfmt-support (QEMU cross-compilation)
|
||||||
# CHROME_EXECUTABLE -- path to the Chromium binary
|
# - emacs-nox (text editing in container)
|
||||||
|
USER root
|
||||||
# ---------- Base image ----------
|
|
||||||
FROM python:3.11-slim
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
ENV PYTHONUNBUFFERED=1
|
|
||||||
|
|
||||||
# ---------- System dependencies for Chromium ----------
|
|
||||||
# The minimum set required to run headless Chromium on Linux.
|
|
||||||
# python:3.11-slim is Debian Bookworm (12) -- package names without t64 suffix.
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
# Chromium and its launcher
|
libportaudio2 \
|
||||||
chromium \
|
|
||||||
chromium-common \
|
|
||||||
chromium-sandbox \
|
|
||||||
# Font rendering for proper page rendering
|
|
||||||
fonts-liberation \
|
|
||||||
fonts-noto-color-emoji \
|
|
||||||
fonts-dejavu-core \
|
|
||||||
# System libraries required by Chromium at runtime
|
|
||||||
libnss3 \
|
|
||||||
libnspr4 \
|
|
||||||
libatk1.0-0 \
|
|
||||||
libatk-bridge2.0-0 \
|
|
||||||
libcups2 \
|
|
||||||
libdrm2 \
|
|
||||||
libxdamage1 \
|
|
||||||
libxfixes3 \
|
|
||||||
libxcomposite1 \
|
|
||||||
libxrandr2 \
|
|
||||||
libgbm1 \
|
|
||||||
libpango-1.0-0 \
|
|
||||||
libcairo2 \
|
|
||||||
libasound2 \
|
|
||||||
libxkbcommon0 \
|
|
||||||
libxshmfence1 \
|
|
||||||
# Virtual framebuffer for headless operation
|
|
||||||
xvfb \
|
|
||||||
# Process supervisor for orphan reaping
|
|
||||||
tini \
|
|
||||||
# Git for Hermes source operations
|
|
||||||
git \
|
|
||||||
# SSL certificates for HTTPS connections
|
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
# Curl for health checks
|
poppler-utils \
|
||||||
curl \
|
imagemagick \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
texlive-latex-base \
|
||||||
|
texlive-latex-extra \
|
||||||
|
texlive-fonts-recommended \
|
||||||
|
texlive-xetex \
|
||||||
|
texlive-science \
|
||||||
|
qemu-user-static \
|
||||||
|
binfmt-support \
|
||||||
|
emacs-nox && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# ---------- Hermes Agent installation ----------
|
# ---------- UV (hyperfast pip alternative) ----------
|
||||||
# Install uv (fast Python package manager)
|
COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/
|
||||||
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
|
|
||||||
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uvx /usr/local/bin/uvx
|
|
||||||
|
|
||||||
# Create hermes user (non-root runtime)
|
WORKDIR /opt/hermes
|
||||||
RUN useradd -u 10000 -m -d /opt/data hermes
|
|
||||||
|
|
||||||
# Install Hermes Agent from PyPI with gateway support for messaging
|
# ---------- Piper TTS dans le venv existant ----------
|
||||||
RUN uv pip install --system --no-cache-dir \
|
# Le venv de l'image de base est root-owned, on doit installer en root aussi
|
||||||
'hermes-agent[gateway]' \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
croniter && \
|
uv pip install --no-cache-dir piper-tts sounddevice numpy
|
||||||
uv cache clean
|
|
||||||
|
|
||||||
# Create the /opt/hermes directory structure expected by entrypoint
|
# ---------- Télécharger la voix Piper Ryan (high quality) ----------
|
||||||
RUN mkdir -p /opt/hermes/.venv/bin && \
|
RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
|
||||||
mkdir -p /opt/hermes/docker && \
|
/opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
ln -sf /usr/local/bin/uv /opt/hermes/.venv/bin/uv && \
|
import urllib.request
|
||||||
ln -sf /usr/local/bin/uvx /opt/hermes/.venv/bin/uvx
|
base = '/opt/hermes/.venv/share/piper/voices'
|
||||||
|
url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
|
||||||
|
urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
|
||||||
|
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
# ---------- Entrypoint script ----------
|
# ---------- Patch tts_tool.py: remplacer Edge TTS par Piper ----------
|
||||||
COPY entrypoint.sh /opt/hermes/docker/entrypoint.sh
|
# Edge TTS appelle les serveurs Microsoft — on ne veut jamais ça.
|
||||||
RUN chmod +x /opt/hermes/docker/entrypoint.sh
|
# Piper roule localement sur CPU, aucun cloud, aucune donnée qui sort.
|
||||||
|
COPY patch_tts_tool.py /tmp/patch_tts_tool.py
|
||||||
|
RUN /opt/hermes/.venv/bin/python3 /tmp/patch_tts_tool.py && rm /tmp/patch_tts_tool.py
|
||||||
|
|
||||||
# ---------- Environment variables ----------
|
# ---------- Runtime ----------
|
||||||
# Point browser tool to system Chromium (installed via apt-get)
|
# Retour à l'utilisateur non-root pour la sécurité
|
||||||
ENV CHROME_EXECUTABLE=/usr/bin/chromium
|
USER hermes
|
||||||
|
|
||||||
# Hermes paths
|
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
ENV PATH="/opt/data/.local/bin:${PATH}"
|
ENV PATH="/opt/data/.local/bin:${PATH}"
|
||||||
|
|
||||||
# Playwright browsers path (for agent-browser install at runtime)
|
|
||||||
ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
|
|
||||||
|
|
||||||
# Virtual framebuffer display for headless Chromium
|
|
||||||
ENV DISPLAY=:99
|
|
||||||
|
|
||||||
# ---------- Data volume ----------
|
|
||||||
VOLUME [ "/opt/data" ]
|
VOLUME [ "/opt/data" ]
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# Script de réparation des permissions + patch TTS au démarrage
|
||||||
USER hermes
|
COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
|
||||||
WORKDIR /opt/data
|
|
||||||
|
|
||||||
ENTRYPOINT [ "/opt/hermes/docker/entrypoint.sh" ]
|
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
|
||||||
CMD [ "gateway", "run" ]
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Hermes Agent entrypoint script
|
|
||||||
# Installs custom tools and runtime dependencies,
|
|
||||||
# then delegates to the passed command (usually "gateway run").
|
|
||||||
|
|
||||||
# Install custom tools from persistent volume if available
|
|
||||||
if [ -f /opt/data/hermes-tools/install.sh ]; then
|
|
||||||
bash /opt/data/hermes-tools/install.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install additional runtime deps (idempotent)
|
|
||||||
if command -v uv &>/dev/null; then
|
|
||||||
uv pip install --system --no-cache-dir --quiet \
|
|
||||||
openai mautrix[encryption] 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Execute the passed command with tini for proper signal handling
|
|
||||||
exec tini -g -- "$@"
|
|
||||||
38
ai/hermes/fix-permissions.sh
Normal file
38
ai/hermes/fix-permissions.sh
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Startup permission fix + TTS patch.
|
||||||
|
# Runs as root before the entrypoint drops to the hermes user.
|
||||||
|
set -e
|
||||||
|
|
||||||
|
HERMES_HOME="${HERMES_HOME:-/opt/data}"
|
||||||
|
|
||||||
|
# Fix ownership on critical writable directories
|
||||||
|
chown -R hermes:hermes \
|
||||||
|
"$HERMES_HOME/sessions" \
|
||||||
|
"$HERMES_HOME/checkpoints" \
|
||||||
|
"$HERMES_HOME/skills" \
|
||||||
|
"$HERMES_HOME/memories" \
|
||||||
|
"$HERMES_HOME/workspace" \
|
||||||
|
"$HERMES_HOME/pastes" \
|
||||||
|
"$HERMES_HOME/logs" \
|
||||||
|
"$HERMES_HOME/cron" \
|
||||||
|
"$HERMES_HOME/plans" \
|
||||||
|
"$HERMES_HOME/hooks" \
|
||||||
|
"$HERMES_HOME/cache" \
|
||||||
|
2>/dev/null || true
|
||||||
|
|
||||||
|
# Fix data volume root ownership
|
||||||
|
if [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$(id -u hermes)" ]; then
|
||||||
|
chown hermes:hermes "$HERMES_HOME" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ---------- Patch tts_tool.py: replace Edge TTS with Piper ----------
|
||||||
|
# Fallback runtime patch in case the volume's site-packages differ from the image.
|
||||||
|
# Idempotent: if already patched, the script does nothing.
|
||||||
|
PATCH_SCRIPT="/opt/hermes/patch_tts_tool.py"
|
||||||
|
if [ -f "$PATCH_SCRIPT" ]; then
|
||||||
|
echo "Applying TTS patch (Piper only, no Edge fallback)..."
|
||||||
|
/opt/hermes/.venv/bin/python3 "$PATCH_SCRIPT" 2>&1 || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Chain to the official Hermes entrypoint
|
||||||
|
exec /opt/hermes/docker/entrypoint.sh "$@"
|
||||||
@@ -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" "$@"
|
|
||||||
@@ -10,8 +10,6 @@ services:
|
|||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
- SSH_PORT=2222
|
- SSH_PORT=2222
|
||||||
- SSH_LISTEN_PORT=2222
|
- SSH_LISTEN_PORT=2222
|
||||||
# Enable Gitea Actions (act_runner required on host)
|
|
||||||
- GITEA__actions__ENABLED=true
|
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Gitea:/data
|
- /mnt/HoardingCow_docker_data/Gitea:/data
|
||||||
networks:
|
networks:
|
||||||
@@ -47,7 +45,7 @@ services:
|
|||||||
image: gitea/act_runner:latest
|
image: gitea/act_runner:latest
|
||||||
container_name: act_runner
|
container_name: act_runner
|
||||||
environment:
|
environment:
|
||||||
- GITEA_INSTANCE_URL=https://code.lazyworkhorse.net
|
- GITEA_INSTANCE_URL=http://gitea:3000
|
||||||
- GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
|
- GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
|
||||||
- GITEA_RUNNER_NAME=ai-host-runner
|
- GITEA_RUNNER_NAME=ai-host-runner
|
||||||
- GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
|
- GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
# Custom wg-easy with iptables-nft (nftables-backed iptables)
|
|
||||||
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
|
|
||||||
FROM ghcr.io/wg-easy/wg-easy:latest
|
|
||||||
|
|
||||||
# The upstream image registers only iptables-legacy with update-alternatives.
|
|
||||||
# iptables-nft binary exists but isn't registered as an alternative key.
|
|
||||||
# Override the alternatives-managed symlinks directly.
|
|
||||||
RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
|
|
||||||
ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables
|
|
||||||
@@ -2,10 +2,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
wireguard:
|
wireguard:
|
||||||
build:
|
image: weejewel/wg-easy:latest
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
image: wg-easy-iptables-nft:latest
|
|
||||||
container_name: wireguard
|
container_name: wireguard
|
||||||
cap_add:
|
cap_add:
|
||||||
- NET_ADMIN
|
- NET_ADMIN
|
||||||
|
|||||||
Reference in New Issue
Block a user