Compare commits
18 Commits
03616e9e3d
...
feat/synct
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a44120b1a | |||
| 38a1451689 | |||
| f9fb28d560 | |||
| bcc4b6d157 | |||
| 8d1ae7e632 | |||
| 29ae32a1c5 | |||
| 8dff094768 | |||
| ec08f5eb5d | |||
| 611e96b306 | |||
| f184ed957c | |||
| 2bf31c7ccc | |||
| f44f93e35a | |||
| 4cdd157e3f | |||
| 3ba0345887 | |||
| 27571ddb3f | |||
| 5e242eb946 | |||
| e607982b21 | |||
| 4627199217 |
@@ -31,6 +31,9 @@ services:
|
|||||||
ssh:
|
ssh:
|
||||||
- default
|
- 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
|
||||||
@@ -51,6 +54,10 @@ 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
|
||||||
@@ -60,6 +67,35 @@ 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,34 +1,52 @@
|
|||||||
# 1. On récupère la version la plus récente d'UV
|
# syntax=docker/dockerfile:1
|
||||||
FROM ghcr.io/astral-sh/uv:latest AS uv_source
|
# Hermes Agent -- custom fork build
|
||||||
|
# Builds on top of official image + overlays our forked source from Gitea.
|
||||||
|
# Requires Docker BuildKit. Pass SSH agent for git clone:
|
||||||
|
# docker compose build hermes
|
||||||
|
# Or manually:
|
||||||
|
# DOCKER_BUILDKIT=1 docker build --ssh default -t hermes-agent:custom .
|
||||||
|
|
||||||
# 2. Image officielle Hermes Agent de NousResearch
|
# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
|
||||||
# Contient déjà: Python, Node.js, npm, Playwright/Chromium, venv, tts_tool.py, etc.
|
|
||||||
FROM nousresearch/hermes-agent:latest
|
FROM nousresearch/hermes-agent:latest
|
||||||
|
|
||||||
# ---------- System dependencies ----------
|
# ---------- Overlay our forked source ----------
|
||||||
# The official hermes-agent image already has: git, curl, ffmpeg, python3,
|
# Uses SSH agent forwarding from the build host (no key baked into image).
|
||||||
# gcc, build-essential, openssh-client, procps, tini, ripgrep, docker-cli,
|
# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
|
||||||
# libportaudio2, ca-certificates, etc.
|
# 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/
|
||||||
|
|
||||||
|
# ---------- Rebuild web UI ----------
|
||||||
|
# Source files changed; node_modules (from base image) reused.
|
||||||
|
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
|
USER root
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
poppler-utils \
|
libportaudio2 ca-certificates poppler-utils imagemagick \
|
||||||
imagemagick \
|
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
||||||
texlive-latex-base \
|
texlive-xetex texlive-science \
|
||||||
texlive-latex-extra \
|
qemu-user-static binfmt-support emacs-nox && \
|
||||||
texlive-fonts-recommended \
|
|
||||||
texlive-xetex \
|
|
||||||
texlive-science && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# ---------- UV (hyperfast pip alternative) ----------
|
# ---------- UV ----------
|
||||||
COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/
|
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
||||||
|
|
||||||
WORKDIR /opt/hermes
|
|
||||||
|
|
||||||
# ---------- Extra Python deps ----------
|
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
|
||||||
uv pip install --no-cache-dir httpx
|
|
||||||
|
|
||||||
# ---------- Piper TTS ----------
|
# ---------- Piper TTS ----------
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
@@ -41,7 +59,6 @@ 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'
|
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, base + '/en_US-ryan-high.onnx')
|
||||||
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
||||||
print('Piper voice downloaded')
|
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
# ---------- Install Himalaya email CLI ----------
|
# ---------- Install Himalaya email CLI ----------
|
||||||
@@ -61,11 +78,6 @@ PYEOF
|
|||||||
# ---------- Install himalaya-ro wrapper ----------
|
# ---------- Install himalaya-ro wrapper ----------
|
||||||
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||||
|
|
||||||
# ---------- Patch tts_tool.py: remplacer Edge TTS par Piper ----------
|
|
||||||
# Edge TTS appelle les serveurs Microsoft — on ne veut jamais ça.
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
@@ -74,9 +86,8 @@ ENV PATH="/opt/data/.local/bin:${PATH}"
|
|||||||
# Point browser tool to Playwright's Chromium (already in base image)
|
# Point browser tool to Playwright's Chromium (already in base image)
|
||||||
ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
||||||
|
|
||||||
VOLUME [ "/opt/data" ]
|
# 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.
|
||||||
|
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
||||||
|
|
||||||
# Startup permission fix + config generation + TTS patch
|
VOLUME [ "/opt/data" ]
|
||||||
COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
|
|
||||||
|
|
||||||
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/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 "$@"
|
|
||||||
@@ -8,13 +8,10 @@ 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:
|
||||||
|
|||||||
9
vpn/Dockerfile
Normal file
9
vpn/Dockerfile
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# 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,7 +2,10 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
wireguard:
|
wireguard:
|
||||||
image: weejewel/wg-easy:latest
|
build:
|
||||||
|
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