Compare commits

..

2 Commits

Author SHA1 Message Date
d7449e93c1 Merge PR #45: fix: create networks as bridge instead of external 2026-05-20 14:39:35 -04:00
Thierry Pouplier
28a172e828 fix: create networks as bridge instead of external
- Changed all networks from external: true to driver: bridge
- Fixes chicken-and-egg problem where networks must exist before stacks can start
- backup_net, ai_net, auth_net, cloud_net, coms_net, finance_net, home_auto_net, homepage_net, passman_net, tak_net, vc_net now created automatically
2026-04-29 18:42:09 +00:00
4 changed files with 18 additions and 78 deletions

68
ai/compose.yml Executable file → Normal file
View File

@@ -32,7 +32,7 @@ services:
- default - default
container_name: hermes container_name: hermes
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 && 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
@@ -44,7 +44,7 @@ services:
- 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,8 +58,6 @@ 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
- /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
devices: devices:
- /dev/kfd:/dev/kfd - /dev/kfd:/dev/kfd
- /dev/dri:/dev/dri - /dev/dri:/dev/dri
@@ -131,62 +129,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 +280,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 +326,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

View File

@@ -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.
@@ -52,7 +50,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'

View File

@@ -96,5 +96,5 @@ services:
networks: networks:
backup_net: backup_net:
external: true driver: bridge
name: backup_net name: backup_net

View File

@@ -82,37 +82,37 @@ networks:
driver: bridge driver: bridge
name: traefik_backend name: traefik_backend
ai_net: ai_net:
external: true driver: bridge
name: ai_net name: ai_net
auth_net: auth_net:
external: true driver: bridge
name: auth_net name: auth_net
backup_net: backup_net:
external: true driver: bridge
name: backup_net name: backup_net
cloud_net: cloud_net:
external: true driver: bridge
name: cloud_net name: cloud_net
coms_net: coms_net:
external: true driver: bridge
name: coms_net name: coms_net
finance_net: finance_net:
external: true driver: bridge
name: finance_net name: finance_net
home_auto_net: home_auto_net:
external: true driver: bridge
name: home_auto_net name: home_auto_net
homepage_net: homepage_net:
external: true driver: bridge
name: homepage_net name: homepage_net
passman_net: passman_net:
external: true driver: bridge
name: passman_net name: passman_net
tak_net: tak_net:
external: true driver: bridge
name: tak_net name: tak_net
vc_net: vc_net:
external: true driver: bridge
name: vc_net name: vc_net
# duckdns: # duckdns: