Compare commits
1 Commits
feat/herme
...
feat/docke
| Author | SHA1 | Date | |
|---|---|---|---|
| c39174f0fe |
@@ -54,10 +54,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 +63,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,134 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
# Hermes Agent with Chromium -- local browser tool support
|
# Hermes Agent -- custom fork build
|
||||||
# Based on python:3.11-slim for minimal footprint.
|
# Builds on top of official image + overlays our forked source from Gitea.
|
||||||
# Chromium installed via apt-get for system-level browser automation.
|
# Requires Docker BuildKit. Pass SSH agent for git clone:
|
||||||
#
|
# docker compose build hermes
|
||||||
# Build:
|
# Or manually:
|
||||||
# docker build -t hermes-agent:chromium .
|
# DOCKER_BUILDKIT=1 docker build --ssh default -t hermes-agent:custom .
|
||||||
#
|
|
||||||
# Environment variables:
|
|
||||||
# CHROME_EXECUTABLE -- path to the Chromium binary
|
|
||||||
|
|
||||||
# ---------- Base image ----------
|
# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
|
||||||
FROM python:3.11-slim
|
FROM nousresearch/hermes-agent:latest
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
# ---------- Overlay our forked source ----------
|
||||||
ENV PYTHONUNBUFFERED=1
|
# 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 && \
|
||||||
|
rsync -a --delete fork/ /opt/hermes/ \
|
||||||
|
--exclude node_modules \
|
||||||
|
--exclude .venv \
|
||||||
|
--exclude .git && \
|
||||||
|
rm -rf /tmp/fork /root/.ssh/
|
||||||
|
|
||||||
# ---------- System dependencies for Chromium ----------
|
# ---------- Rebuild web UI ----------
|
||||||
# The minimum set required to run headless Chromium on Linux.
|
# Source files changed; node_modules (from base image) reused.
|
||||||
# python:3.11-slim is Debian Bookworm (12) -- package names without t64 suffix.
|
RUN cd /opt/hermes && npm run build
|
||||||
|
|
||||||
|
# ---------- 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 && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
# Chromium and its launcher
|
libportaudio2 ca-certificates poppler-utils imagemagick \
|
||||||
chromium \
|
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
||||||
chromium-common \
|
texlive-xetex texlive-science \
|
||||||
chromium-sandbox \
|
qemu-user-static binfmt-support emacs-nox && \
|
||||||
# Font rendering for proper page rendering
|
rm -rf /var/lib/apt/lists/*
|
||||||
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 \
|
|
||||||
# Curl for health checks
|
|
||||||
curl \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# ---------- Hermes Agent installation ----------
|
# ---------- UV ----------
|
||||||
# Install uv (fast Python package manager)
|
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /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)
|
# ---------- Piper TTS ----------
|
||||||
RUN useradd -u 10000 -m -d /opt/data hermes
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
|
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
||||||
|
mkdir -p /opt/hermes/.venv/share/piper/voices
|
||||||
|
|
||||||
# Install Hermes Agent from PyPI with gateway support for messaging
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
RUN uv pip install --system --no-cache-dir \
|
import urllib.request
|
||||||
'hermes-agent[gateway]' \
|
base = '/opt/hermes/.venv/share/piper/voices'
|
||||||
croniter && \
|
url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
|
||||||
uv cache clean
|
urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
|
||||||
|
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
# Create the /opt/hermes directory structure expected by entrypoint
|
# ---------- Install Himalaya email CLI ----------
|
||||||
RUN mkdir -p /opt/hermes/.venv/bin && \
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
mkdir -p /opt/hermes/docker && \
|
import urllib.request, tarfile, os, shutil
|
||||||
ln -sf /usr/local/bin/uv /opt/hermes/.venv/bin/uv && \
|
url = 'https://github.com/pimalaya/himalaya/releases/download/v1.2.0/himalaya.x86_64-linux.tgz'
|
||||||
ln -sf /usr/local/bin/uvx /opt/hermes/.venv/bin/uvx
|
tgz = '/tmp/himalaya.tgz'
|
||||||
|
urllib.request.urlretrieve(url, tgz)
|
||||||
|
with tarfile.open(tgz) as t:
|
||||||
|
t.extractall('/tmp')
|
||||||
|
shutil.move('/tmp/himalaya', '/usr/local/bin/himalaya')
|
||||||
|
os.chmod('/usr/local/bin/himalaya', 0o755)
|
||||||
|
os.remove(tgz)
|
||||||
|
print('himalaya v1.2.0 installed')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
# ---------- Entrypoint script ----------
|
# ---------- Install himalaya-ro wrapper ----------
|
||||||
COPY entrypoint.sh /opt/hermes/docker/entrypoint.sh
|
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||||
RUN chmod +x /opt/hermes/docker/entrypoint.sh
|
|
||||||
|
|
||||||
# ---------- Environment variables ----------
|
# ---------- Install 7-Zip for CHM extraction ----------
|
||||||
# Point browser tool to system Chromium (installed via apt-get)
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
ENV CHROME_EXECUTABLE=/usr/bin/chromium
|
import urllib.request, tarfile, os, shutil, re, subprocess
|
||||||
|
|
||||||
# Hermes paths
|
# Scrape 7-zip.org for latest Linux x64 binary
|
||||||
ENV HERMES_HOME=/opt/data
|
url = 'https://7-zip.org/download.html'
|
||||||
ENV PATH="/opt/data/.local/bin:${PATH}"
|
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
|
r = urllib.request.urlopen(req, timeout=15)
|
||||||
|
html = r.read().decode()
|
||||||
|
|
||||||
# Playwright browsers path (for agent-browser install at runtime)
|
links = re.findall(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
|
||||||
ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
|
if not links:
|
||||||
|
raise RuntimeError("Could not find 7z download link")
|
||||||
|
|
||||||
# Virtual framebuffer display for headless Chromium
|
dl_url = f'https://7-zip.org/{links[0]}'
|
||||||
ENV DISPLAY=:99
|
print(f'Downloading 7z from {dl_url}...')
|
||||||
|
req = urllib.request.Request(dl_url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
|
r = urllib.request.urlopen(req, timeout=30)
|
||||||
|
data = r.read()
|
||||||
|
|
||||||
|
with open('/tmp/7z.tar.xz', 'wb') as f:
|
||||||
|
f.write(data)
|
||||||
|
|
||||||
|
subprocess.run(['tar', '-xJf', '/tmp/7z.tar.xz', '-C', '/tmp/'], check=True)
|
||||||
|
|
||||||
|
for root, dirs, files in os.walk('/tmp'):
|
||||||
|
for f in files:
|
||||||
|
if f == '7zz':
|
||||||
|
src = os.path.join(root, f)
|
||||||
|
shutil.move(src, '/usr/local/bin/7zz')
|
||||||
|
os.chmod('/usr/local/bin/7zz', 0o755)
|
||||||
|
print(f'7zz installed from {src}')
|
||||||
|
break
|
||||||
|
|
||||||
|
os.remove('/tmp/7z.tar.xz')
|
||||||
|
|
||||||
|
# Verify
|
||||||
|
r = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
|
||||||
|
print(f'7-Zip {r.stdout.strip()[:60]}')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
# ---------- Data volume ----------
|
|
||||||
VOLUME [ "/opt/data" ]
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
WORKDIR /opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
|
ENV PATH="/opt/data/.local/bin:${PATH}"
|
||||||
|
# Point browser tool to Playwright's Chromium (already in base image)
|
||||||
|
ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
||||||
|
|
||||||
ENTRYPOINT [ "/opt/hermes/docker/entrypoint.sh" ]
|
# Ensure tools directory and toolsets.py are writable by the hermes runtime user
|
||||||
CMD [ "gateway", "run" ]
|
# so custom tools can be injected from the persistent volume at startup.
|
||||||
|
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
||||||
|
|
||||||
|
VOLUME [ "/opt/data" ]
|
||||||
@@ -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 -- "$@"
|
|
||||||
@@ -8,10 +8,13 @@ services:
|
|||||||
- USER_GID=1000
|
- USER_GID=1000
|
||||||
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
|
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
||||||
- SSH_PORT=2222
|
- SSH_PORT=2222
|
||||||
- SSH_LISTEN_PORT=2222
|
- SSH_LISTEN_PORT=2222
|
||||||
# Enable Gitea Actions (act_runner required on host)
|
# Enable Gitea Actions (act_runner required on host)
|
||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
|
# Don't fetch actions from GitHub (offline mode + local only)
|
||||||
|
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Gitea:/data
|
- /mnt/HoardingCow_docker_data/Gitea:/data
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
Reference in New Issue
Block a user