Compare commits

..

1 Commits

Author SHA1 Message Date
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
7 changed files with 46 additions and 303 deletions

View File

@@ -1,66 +0,0 @@
# 1. On récupère la version la plus récente d'UV
FROM ghcr.io/astral-sh/uv:latest AS uv_source
# 2. Image de base stable
FROM debian:stable-slim
# Disable Python stdout buffering to ensure logs are printed immediately
ENV PYTHONUNBUFFERED=1
# Install system dependencies in one layer, clear APT cache
# tini reaps orphaned zombie processes (MCP stdio subprocesses, git, bun, etc.)
RUN apt-get update && \
apt-get install -y --no-install-recommends \
build-essential python3 ripgrep ffmpeg gcc python3-dev libffi-dev procps git openssh-client docker-cli tini \
curl poppler-utils imagemagick \
texlive-latex-base texlive-latex-extra texlive-fonts-recommended texlive-xetex texlive-science \
qemu-user-static binfmt-support qemu-user-binfmt \
emacs-nox \
libportaudio2 && \
rm -rf /var/lib/apt/lists/*
# Création de l'utilisateur 'hermes' directement avec les bons accès
RUN useradd -u 10000 -m -d /opt/data hermes
# Copie d'uv (dernière version)
COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/
WORKDIR /opt/hermes
# On donne la propriété du dossier de travail à l'utilisateur hermes
RUN chown hermes:hermes /opt/hermes
# ---------- Hermes venv ----------
# Passer immédiatement sous l'utilisateur hermes pour tout le reste du build
USER hermes
# ---------- Source code ----------
# On copie tout le projet d'un coup sans assumer la présence de fichiers de lock spécifiques
COPY --chown=hermes:hermes . .
# ---------- Python virtualenv avec Piper TTS ----------
RUN uv venv && \
uv pip install --no-cache-dir piper-tts sounddevice numpy faster-whisper
# ---------- Télécharger la voix Piper Ryan ----------
RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
/opt/hermes/.venv/bin/python3 -c "
import urllib.request
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 + '?download=true', base + '/en_US-ryan-high.onnx')
urllib.request.urlretrieve(url + '.onnx.json?download=true', base + '/en_US-ryan-high.onnx.json')
"
# ---------- Patch tts_tool.py: remplacer Coqui par Piper, supprimer Edge ----------
COPY ai/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 ----------
ENV HERMES_HOME=/opt/data
ENV PATH="/opt/data/.local/bin:${PATH}"
VOLUME [ "/opt/data" ]
# Le conteneur tourne de manière ultra-sécurisée sous l'utilisateur hermes dès le départ
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/docker/entrypoint.sh" ]

View File

@@ -1,32 +1,32 @@
version: "3.8"
services:
# webui:
# image: ghcr.io/open-webui/open-webui:main
# volumes:
# - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
# restart: always
# environment:
# - OLLAMA_API_BASE_URL=http://ollama:11434/api
# networks:
# - ai_net
# - ai_backend
# labels:
# - "traefik.enable=true"
webui:
image: ghcr.io/open-webui/open-webui:main
volumes:
- /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
restart: always
environment:
- OLLAMA_API_BASE_URL=http://ollama:11434/api
networks:
- ai_net
- ai_backend
labels:
- "traefik.enable=true"
# # Router for HTTP + redirection to HTTPS
# - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
# - "traefik.http.routers.webui-http.entrypoints=web"
# - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
# Router for HTTP + redirection to HTTPS
- "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
- "traefik.http.routers.webui-http.entrypoints=web"
- "traefik.http.routers.webui-http.middlewares=redirect-to-https"
# # Router for HTTPS with TLS
# - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
# - "traefik.http.routers.webui-https.entrypoints=websecure"
# - "traefik.http.routers.webui-https.tls=true"
# - "traefik.http.routers.webui-https.tls.certresolver=njalla"
# Router for HTTPS with TLS
- "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
- "traefik.http.routers.webui-https.entrypoints=websecure"
- "traefik.http.routers.webui-https.tls=true"
- "traefik.http.routers.webui-https.tls.certresolver=njalla"
hermes:
build: ./
image: nousresearch/hermes-agent:latest
container_name: hermes
restart: always
# Gateway run enables the internal API server on port 8642
@@ -39,12 +39,6 @@ services:
- API_SERVER_KEY=hermes_local_key
- GATEWAY_ALLOW_ALL_USERS=true
- OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
# ROCm for GPU-accelerated faster-whisper STT
- HSA_OVERRIDE_GFX_VERSION=9.0.6
- HCC_AMDGPU_TARGET=gfx906
- HIP_VISIBLE_DEVICES=0,1
- ROCR_VISIBLE_DEVICES=0,1
- HSA_ENABLE_SDMA=0
volumes:
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
devices:

View File

@@ -1,147 +0,0 @@
#!/usr/bin/env python3
"""Patch Hermes TTS tool to add Piper provider and remove Edge TTS fallback."""
import sys
tts_path = '/opt/hermes/.venv/lib/python3.13/site-packages/tools/tts_tool.py'
with open(tts_path) as f:
code = f.read()
# Replace the Coqui provider block with Piper
old_coqui = ' elif provider == "coqui":'
new_piper = ''' elif provider == "piper":
logger.info("Generating speech with Piper TTS (local, CPU)...")
import subprocess
piper_binary = "/opt/hermes/.venv/bin/piper"
piper_config = tts_config.get("piper", {})
voice = piper_config.get("voice", "en_US-lessac-medium")
model_dir = piper_config.get("model_dir", "/opt/hermes/.venv/share/piper/voices")
model_path = os.path.join(model_dir, f"{voice}.onnx")
if not os.path.exists(model_path):
raise FileNotFoundError(f"Piper voice model not found: {model_path}")
cmd = [piper_binary, "--model", model_path, "--output-raw"]
proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
raw_audio, stderr = proc.communicate(input=text.encode(), timeout=60)
if proc.returncode != 0:
raise RuntimeError(f"Piper TTS failed: {stderr.decode()[:200]}")
ffmpeg_cmd = ["ffmpeg", "-f", "s16le", "-ar", "22050", "-ac", "1", "-i", "-", "-y", file_str]
subprocess.run(ffmpeg_cmd, input=raw_audio, capture_output=True, timeout=30)
logger.info("Piper TTS audio saved: %s", file_str)'''
if old_coqui in code:
code = code.replace(old_coqui, new_piper)
print("Coqui -> Piper replaced")
else:
# Fresh Hermes install - add Piper after the last provider (kittentts)
if 'provider == "piper"' in code:
print("Piper already present, skipping coqui replacement")
else:
print("Stock Hermes - adding Piper provider after kittentts...")
marker = ' elif provider == "kittentts":'
if marker in code:
# Find the end of the kittentts block and insert Piper before else
lines = code.split('\n')
kit_idx = None
for i, line in enumerate(lines):
if line.strip().startswith('elif provider == "kittentts":'):
kit_idx = i
break
if kit_idx is not None:
# Find the next blank line + else block
for i in range(kit_idx, len(lines)):
if lines[i].strip() == 'else:':
# Insert Piper block before this line
indent = ' '
piper_lines = new_piper.split('\n')
insert = piper_lines + ['']
lines[i:i] = insert
code = '\n'.join(lines)
print("Piper provider added after kittentts")
break
# Replace the Edge fallback with Piper fallback
old_edge = ''' else:
# Default: Edge TTS (free), with NeuTTS as local fallback
edge_available = True
try:
_import_edge_tts()
except ImportError:
edge_available = False
if edge_available:
logger.info("Generating speech with Edge TTS...")
try:
import concurrent.futures
with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
pool.submit(
lambda: asyncio.run(_generate_edge_tts(text, file_str, tts_config))
).result(timeout=60)
except RuntimeError:
asyncio.run(_generate_edge_tts(text, file_str, tts_config))
elif _check_neutts_available():
logger.info("Edge TTS not available, falling back to NeuTTS (local)...")
provider = "neutts"
_generate_neutts(text, file_str, tts_config)
else:
return json.dumps({
"success": False,
"error": "No TTS provider available. Install edge-tts (pip install edge-tts) "
"or set up NeuTTS for local synthesis."
}, ensure_ascii=False)'''
new_piper_fallback = ''' else:
# Default: Piper TTS (local, CPU, no cloud)
piper_available = False
try:
piper_binary = "/opt/hermes/.venv/bin/piper"
piper_config = tts_config.get("piper", {})
voice = piper_config.get("voice", "en_US-lessac-medium")
model_dir = piper_config.get("model_dir", "/opt/hermes/.venv/share/piper/voices")
model_path = os.path.join(model_dir, f"{voice}.onnx")
if os.path.exists(model_path):
piper_available = True
except Exception:
pass
if piper_available:
logger.info("Generating speech with Piper TTS (local, CPU)...")
import subprocess
piper_binary = "/opt/hermes/.venv/bin/piper"
piper_config = tts_config.get("piper", {})
voice = piper_config.get("voice", "en_US-lessac-medium")
model_dir = piper_config.get("model_dir", "/opt/hermes/.venv/share/piper/voices")
model_path = os.path.join(model_dir, f"{voice}.onnx")
cmd = [piper_binary, "--model", model_path, "--output-raw"]
proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
raw_audio, stderr = proc.communicate(input=text.encode(), timeout=60)
if proc.returncode != 0:
raise RuntimeError(f"Piper TTS failed: {stderr.decode()[:200]}")
ffmpeg_cmd = ["ffmpeg", "-f", "s16le", "-ar", "22050", "-ac", "1", "-i", "-", "-y", file_str]
subprocess.run(ffmpeg_cmd, input=raw_audio, capture_output=True, timeout=30)
logger.info("Piper TTS audio saved: %s", file_str)
else:
return json.dumps({
"success": False,
"error": "No TTS provider available. Install Piper TTS (pip install piper-tts) "
"and download a voice model."
}, ensure_ascii=False)'''
if old_edge in code:
code = code.replace(old_edge, new_piper_fallback)
print("Edge fallback replaced with Piper")
else:
print("Edge fallback NOT found, checking if already Piper...")
if 'Default: Piper TTS' in code:
print("Piper fallback already present, skipping")
else:
print("ERROR: Could not find Edge fallback")
# Debug: show what the else block looks like
import re
match = re.search(r' else:\n # Default:', code)
if match:
print("Found else block at", match.start())
sys.exit(1)
with open(tts_path, 'w') as f:
f.write(code)
print("tts_tool.py patched successfully")

View File

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

View File

@@ -1,15 +1,15 @@
version: "3.9"
services:
# nomadnet:
# image: ghcr.io/markqvist/nomadnet:master
# container_name: nomadnet
# restart: always
# volumes:
# - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
# - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
# # Reticulum transport must be reachable directly (NOT through Traefik)
# ports:
# - "4242:4242"
nomadnet:
image: ghcr.io/markqvist/nomadnet:master
container_name: nomadnet
restart: always
volumes:
- /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
- /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
# Reticulum transport must be reachable directly (NOT through Traefik)
ports:
- "4242:4242"
synapse:
image: ghcr.io/element-hq/synapse:latest

View File

@@ -13,20 +13,17 @@ services:
- "--certificatesresolvers.njalla.acme.storage=/letsencrypt/acme.json"
- "--certificatesresolvers.njalla.acme.httpchallenge.entrypoint=web"
- "--log.level=INFO"
- "--log.filepath=/var/log/traefik/traefik.log"
- "--accesslog.filepath=/var/log/traefik/access.log"
- "--log.level=DEBUG"
- "--providers.docker=true"
- "--providers.docker.exposedByDefault=false"
ports:
- "80:80"
- "443:443"
environment:
- NJALLA_TOKEN=***
- NJALLA_TOKEN=${NJALLA_TOKEN}
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /mnt/HoardingCow_docker_data/Traefik:/letsencrypt
- /var/log/traefik:/var/log/traefik
restart: unless-stopped
networks:
- traefik_backend
@@ -82,37 +79,37 @@ networks:
driver: bridge
name: traefik_backend
ai_net:
external: true
driver: bridge
name: ai_net
auth_net:
external: true
driver: bridge
name: auth_net
backup_net:
external: true
driver: bridge
name: backup_net
cloud_net:
external: true
driver: bridge
name: cloud_net
coms_net:
external: true
driver: bridge
name: coms_net
finance_net:
external: true
driver: bridge
name: finance_net
home_auto_net:
external: true
driver: bridge
name: home_auto_net
homepage_net:
external: true
driver: bridge
name: homepage_net
passman_net:
external: true
driver: bridge
name: passman_net
tak_net:
external: true
driver: bridge
name: tak_net
vc_net:
external: true
driver: bridge
name: vc_net
# duckdns:

View File

@@ -1,35 +0,0 @@
version: "3.8"
services:
wireguard:
image: weejewel/wg-easy:latest
container_name: wireguard
cap_add:
- NET_ADMIN
- SYS_MODULE
environment:
- WG_HOST=vpn.lazyworkhorse.net
- PASSWORD=${WG_PASSWORD}
- WG_PORT=51820
- WG_DEFAULT_ADDRESS=10.8.0.x
- WG_DEFAULT_DNS=1.1.1.1,8.8.8.8
- WG_ALLOWED_IPS=0.0.0.0/0, ::/0
- WG_PERSISTENT_KEEPALIVE=25
- UI_TRAFFIC_STATS=true
- UI_CHART_TYPE=0
ports:
- "51820:51820/udp"
- "51821:51821/tcp"
volumes:
- /mnt/HoardingCow_docker_data/WireGuard:/etc/wireguard:rw
sysctls:
- net.ipv4.conf.all.src_valid_mark=1
- net.ipv4.ip_forward=1
restart: unless-stopped
networks:
- vpn_net
networks:
vpn_net:
external: true
name: vpn_net