Compare commits
33 Commits
feat/herme
...
fix/remove
| Author | SHA1 | Date | |
|---|---|---|---|
| d8a1ebcd96 | |||
| 567850bd13 | |||
| 2d59bb44c3 | |||
| bf56d4be8b | |||
| 1c8efb1090 | |||
| 7725830e6c | |||
| 548e15d6b4 | |||
| 35aa466e87 | |||
| 2ff99b1f57 | |||
| dea1429a5d | |||
| ebad994d60 | |||
| 5f25c87775 | |||
| 4e566b2408 | |||
| d3f2e3b7b9 | |||
| 6a44120b1a | |||
| 38a1451689 | |||
| f9fb28d560 | |||
| bcc4b6d157 | |||
| 8d1ae7e632 | |||
| 29ae32a1c5 | |||
| 8dff094768 | |||
| ec08f5eb5d | |||
| 611e96b306 | |||
| f184ed957c | |||
| 2bf31c7ccc | |||
| f44f93e35a | |||
| 4cdd157e3f | |||
| 3ba0345887 | |||
| 27571ddb3f | |||
| 5e242eb946 | |||
|
|
2aab06cc1a | ||
|
|
a404f5e2c4 | ||
|
|
f9afd79f3e |
64
ai/compose.yml
Normal file → Executable file
64
ai/compose.yml
Normal file → Executable file
@@ -32,13 +32,18 @@ services:
|
|||||||
- default
|
- default
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
entrypoint: ["/bin/bash", "-c",
|
entrypoint: ["/bin/bash", "-c",
|
||||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
"bash /opt/data/hermes-tools/install.sh && bash /opt/data/hermes-tools/run-multi-gateways.sh && 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
|
||||||
|
# Multi-profile: comma-separated list of profiles to run as gateways.
|
||||||
|
# The entrypoint reads this and starts one gateway per profile.
|
||||||
|
# Add profiles here when they exist on disk (e.g. default,researcher,writer)
|
||||||
|
- HERMES_PROFILES=ashley,claire,finn,matt,paul
|
||||||
- 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
|
||||||
@@ -54,6 +59,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
|
||||||
@@ -62,6 +71,59 @@ 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:
|
||||||
|
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:
|
||||||
|
|||||||
@@ -20,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 && \
|
||||||
@@ -40,6 +34,7 @@ USER root
|
|||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
libportaudio2 ca-certificates poppler-utils imagemagick \
|
libportaudio2 ca-certificates poppler-utils imagemagick \
|
||||||
|
libolm-dev \
|
||||||
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
||||||
texlive-xetex texlive-science \
|
texlive-xetex texlive-science \
|
||||||
qemu-user-static binfmt-support emacs-nox && \
|
qemu-user-static binfmt-support emacs-nox && \
|
||||||
@@ -48,6 +43,12 @@ RUN apt-get update && \
|
|||||||
# ---------- UV ----------
|
# ---------- UV ----------
|
||||||
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/
|
||||||
|
|
||||||
|
# ---------- 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
|
||||||
|
|
||||||
# ---------- 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 && \
|
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
||||||
@@ -61,6 +62,20 @@ 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')
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
|
# ---------- Install Himalaya email CLI ----------
|
||||||
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
|
import urllib.request, tarfile, os, shutil
|
||||||
|
url = 'https://github.com/pimalaya/himalaya/releases/download/v1.2.0/himalaya.x86_64-linux.tgz'
|
||||||
|
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
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
@@ -70,6 +85,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" ]
|
||||||
@@ -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