Compare commits
1 Commits
fix/hermes
...
feature/he
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b5030df475 |
@@ -1,73 +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 officielle Hermes Agent de NousResearch
|
|
||||||
# Contient déjà: Python, Node.js, npm, Playwright/Chromium, venv, tts_tool.py, etc.
|
|
||||||
FROM nousresearch/hermes-agent:latest
|
|
||||||
|
|
||||||
# ---------- System dependencies ----------
|
|
||||||
# The official hermes-agent image already has: git, curl, ffmpeg, python3,
|
|
||||||
# gcc, build-essential, openssh-client, procps, tini, ripgrep, docker-cli,
|
|
||||||
# libportaudio2, ca-certificates, etc.
|
|
||||||
#
|
|
||||||
# These extras we need to add back:
|
|
||||||
# - poppler-utils, imagemagick (PDF/image processing)
|
|
||||||
# - texlive-* (LaTeX typesetting for reports)
|
|
||||||
# - qemu-user-static, binfmt-support (QEMU cross-compilation)
|
|
||||||
# - emacs-nox (text editing in container)
|
|
||||||
USER root
|
|
||||||
RUN apt-get update && \
|
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
libportaudio2 \
|
|
||||||
ca-certificates \
|
|
||||||
poppler-utils \
|
|
||||||
imagemagick \
|
|
||||||
texlive-latex-base \
|
|
||||||
texlive-latex-extra \
|
|
||||||
texlive-fonts-recommended \
|
|
||||||
texlive-xetex \
|
|
||||||
texlive-science \
|
|
||||||
qemu-user-static \
|
|
||||||
binfmt-support \
|
|
||||||
emacs-nox && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# ---------- UV (hyperfast pip alternative) ----------
|
|
||||||
COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/
|
|
||||||
|
|
||||||
WORKDIR /opt/hermes
|
|
||||||
|
|
||||||
# ---------- Piper TTS dans le venv existant ----------
|
|
||||||
# Le venv de l'image de base est root-owned, on doit installer en root aussi
|
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
|
||||||
uv pip install --no-cache-dir piper-tts sounddevice numpy
|
|
||||||
|
|
||||||
# ---------- Télécharger la voix Piper Ryan (high quality) ----------
|
|
||||||
RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
|
|
||||||
/opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
|
||||||
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, base + '/en_US-ryan-high.onnx')
|
|
||||||
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
|
||||||
PYEOF
|
|
||||||
|
|
||||||
# ---------- 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 ----------
|
|
||||||
# Retour à l'utilisateur non-root pour la sécurité
|
|
||||||
USER hermes
|
|
||||||
|
|
||||||
ENV HERMES_HOME=/opt/data
|
|
||||||
ENV PATH="/opt/data/.local/bin:${PATH}"
|
|
||||||
|
|
||||||
VOLUME [ "/opt/data" ]
|
|
||||||
|
|
||||||
# Script de réparation des permissions + patch TTS au démarrage
|
|
||||||
COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
|
|
||||||
|
|
||||||
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
|
|
||||||
@@ -1,32 +1,34 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
|
|
||||||
# webui:
|
webui:
|
||||||
# image: ghcr.io/open-webui/open-webui:main
|
image: ghcr.io/open-webui/open-webui:main
|
||||||
# volumes:
|
volumes:
|
||||||
# - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
|
- /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
|
||||||
# restart: always
|
restart: always
|
||||||
# environment:
|
environment:
|
||||||
# - OLLAMA_API_BASE_URL=http://ollama:11434/api
|
- OLLAMA_API_BASE_URL=http://ollama:11434/api
|
||||||
# networks:
|
networks:
|
||||||
# - ai_net
|
- ai_net
|
||||||
# - ai_backend
|
- ai_backend
|
||||||
# labels:
|
labels:
|
||||||
# - "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
|
|
||||||
# # Router for HTTP + redirection to HTTPS
|
# Router for HTTP + redirection to HTTPS
|
||||||
# - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
|
- "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
|
||||||
# - "traefik.http.routers.webui-http.entrypoints=web"
|
- "traefik.http.routers.webui-http.entrypoints=web"
|
||||||
# - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
|
- "traefik.http.routers.webui-http.middlewares=redirect-to-https"
|
||||||
|
|
||||||
# # Router for HTTPS with TLS
|
# Router for HTTPS with TLS
|
||||||
# - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
|
- "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
|
||||||
# - "traefik.http.routers.webui-https.entrypoints=websecure"
|
- "traefik.http.routers.webui-https.entrypoints=websecure"
|
||||||
# - "traefik.http.routers.webui-https.tls=true"
|
- "traefik.http.routers.webui-https.tls=true"
|
||||||
# - "traefik.http.routers.webui-https.tls.certresolver=njalla"
|
- "traefik.http.routers.webui-https.tls.certresolver=njalla"
|
||||||
|
|
||||||
hermes:
|
hermes:
|
||||||
build: ./
|
build:
|
||||||
|
context: ./hermes
|
||||||
|
dockerfile: Dockerfile
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
restart: always
|
restart: always
|
||||||
# Gateway run enables the internal API server on port 8642
|
# Gateway run enables the internal API server on port 8642
|
||||||
@@ -39,13 +41,6 @@ services:
|
|||||||
- 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=${OPENROUTER_API_KEY}
|
- 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
|
|
||||||
- TZ=America/Montreal
|
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
||||||
devices:
|
devices:
|
||||||
|
|||||||
@@ -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 "$@"
|
|
||||||
10
ai/hermes/Dockerfile
Normal file
10
ai/hermes/Dockerfile
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
FROM nousresearch/hermes-agent:latest
|
||||||
|
|
||||||
|
# Install Chromium for browser tool
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
chromium \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
|
&& apt-get clean
|
||||||
|
|
||||||
|
# Set environment variable for Chromium path
|
||||||
|
ENV CHROME_EXECUTABLE=/usr/bin/chromium
|
||||||
@@ -1,181 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""Patch Hermes TTS tool: add Piper TTS provider, remove Edge TTS as default.
|
|
||||||
|
|
||||||
Patches ALL copies of tts_tool.py found (venv site-packages + /opt/hermes/tools/).
|
|
||||||
|
|
||||||
Searches multiple paths for tts_tool.py so it works both at build time
|
|
||||||
(in the image venv) and at runtime (on the mounted data volume).
|
|
||||||
|
|
||||||
Idempotent: if already patched, does nothing.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Search for all copies of tts_tool.py
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
CANDIDATE_PATHS = [
|
|
||||||
"/opt/hermes/.venv/lib/python3.13/site-packages/tools/tts_tool.py",
|
|
||||||
"/opt/hermes/tools/tts_tool.py",
|
|
||||||
]
|
|
||||||
|
|
||||||
found_paths = []
|
|
||||||
|
|
||||||
for p in CANDIDATE_PATHS:
|
|
||||||
if os.path.exists(p):
|
|
||||||
found_paths.append(p)
|
|
||||||
print(f"Found tts_tool.py at: {p}")
|
|
||||||
|
|
||||||
# Also try to find via Python import
|
|
||||||
import subprocess
|
|
||||||
try:
|
|
||||||
result = subprocess.run(
|
|
||||||
[sys.executable, "-c", "import tools.tts_tool; print(tools.tts_tool.__file__)"],
|
|
||||||
capture_output=True, text=True, timeout=5
|
|
||||||
)
|
|
||||||
if result.returncode == 0:
|
|
||||||
p = result.stdout.strip()
|
|
||||||
if os.path.exists(p) and p not in found_paths:
|
|
||||||
found_paths.append(p)
|
|
||||||
print(f"Found tts_tool.py via import at: {p}")
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if not found_paths:
|
|
||||||
print("WARNING: tts_tool.py not found anywhere. Patching deferred to runtime.")
|
|
||||||
print(f"Searched: {CANDIDATE_PATHS}")
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Old else block: the Edge TTS default fallback to replace
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
old_else = ''' 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 block: elif provider == "piper" + else: fallback with Piper only
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
new_block = ''' elif provider == "piper":
|
|
||||||
# Piper TTS (local, CPU, no cloud, no Microsoft)
|
|
||||||
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):
|
|
||||||
return json.dumps({
|
|
||||||
"success": False,
|
|
||||||
"error": "Piper TTS voice model not found. "
|
|
||||||
"Install Piper TTS and download a voice model."
|
|
||||||
}, ensure_ascii=False)
|
|
||||||
logger.info("Generating speech with Piper TTS (local, CPU)...")
|
|
||||||
import subprocess as _sp
|
|
||||||
cmd = [piper_binary, "--model", model_path, "--output-raw"]
|
|
||||||
try:
|
|
||||||
proc = _sp.Popen(cmd, stdin=_sp.PIPE, stdout=_sp.PIPE, stderr=_sp.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]
|
|
||||||
_sp.run(ffmpeg_cmd, input=raw_audio, capture_output=True, timeout=30)
|
|
||||||
except Exception as e:
|
|
||||||
return json.dumps({
|
|
||||||
"success": False,
|
|
||||||
"error": f"Piper TTS failed: {e}"
|
|
||||||
}, ensure_ascii=False)
|
|
||||||
|
|
||||||
else:
|
|
||||||
# Default: Piper TTS (local, CPU, no cloud, no Microsoft)
|
|
||||||
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) and os.path.exists(piper_binary):
|
|
||||||
logger.info("Generating speech with Piper TTS (local, CPU)...")
|
|
||||||
import subprocess as _sp
|
|
||||||
cmd = [piper_binary, "--model", model_path, "--output-raw"]
|
|
||||||
try:
|
|
||||||
proc = _sp.Popen(cmd, stdin=_sp.PIPE, stdout=_sp.PIPE, stderr=_sp.PIPE)
|
|
||||||
raw_audio, stderr = proc.communicate(input=text.encode(), timeout=60)
|
|
||||||
if proc.returncode != 0:
|
|
||||||
raise RuntimeError(stderr.decode()[:200])
|
|
||||||
ffmpeg_cmd = ["ffmpeg", "-f", "s16le", "-ar", "22050", "-ac", "1", "-i", "-", "-y", file_str]
|
|
||||||
_sp.run(ffmpeg_cmd, input=raw_audio, capture_output=True, timeout=30)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
return json.dumps({
|
|
||||||
"success": False,
|
|
||||||
"error": "Piper TTS not available. Install piper-tts and download a voice model."
|
|
||||||
}, ensure_ascii=False)'''
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Apply the patch to all copies found
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
patched_any = False
|
|
||||||
|
|
||||||
for tts_path in found_paths:
|
|
||||||
with open(tts_path) as f:
|
|
||||||
code = f.read()
|
|
||||||
|
|
||||||
if 'provider == "piper"' in code:
|
|
||||||
print(f"ALREADY PATCHED: {tts_path}")
|
|
||||||
continue
|
|
||||||
|
|
||||||
if old_else in code:
|
|
||||||
code = code.replace(old_else, new_block, 1)
|
|
||||||
with open(tts_path, 'w') as f:
|
|
||||||
f.write(code)
|
|
||||||
print(f"PATCHED: {tts_path}")
|
|
||||||
patched_any = True
|
|
||||||
else:
|
|
||||||
print(f"SKIP {tts_path}: Edge fallback pattern not found")
|
|
||||||
import re
|
|
||||||
for m in re.finditer(r' else:\n # Default:', code):
|
|
||||||
start = max(0, m.start() - 100)
|
|
||||||
end = min(len(code), m.end() + 300)
|
|
||||||
print(f" Found 'else:/# Default:' at position {m.start()}:")
|
|
||||||
print(f" {code[start:end]}")
|
|
||||||
print(" ---")
|
|
||||||
# Don't exit with error — if one copy isn't patchable, try the others
|
|
||||||
|
|
||||||
if not patched_any:
|
|
||||||
all_patched = all(
|
|
||||||
'provider == "piper"' in open(p).read()
|
|
||||||
for p in found_paths
|
|
||||||
)
|
|
||||||
if all_patched:
|
|
||||||
print("All copies already patched.")
|
|
||||||
sys.exit(0)
|
|
||||||
print("WARNING: Could not patch any copy of tts_tool.py")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print("tts_tool.py patched successfully across all copies.")
|
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
version: "3.9"
|
version: "3.9"
|
||||||
services:
|
services:
|
||||||
# nomadnet:
|
nomadnet:
|
||||||
# image: ghcr.io/markqvist/nomadnet:master
|
image: ghcr.io/markqvist/nomadnet:master
|
||||||
# container_name: nomadnet
|
container_name: nomadnet
|
||||||
# restart: always
|
restart: always
|
||||||
# volumes:
|
volumes:
|
||||||
# - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
|
- /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
|
||||||
# - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
|
- /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
|
||||||
# # Reticulum transport must be reachable directly (NOT through Traefik)
|
# Reticulum transport must be reachable directly (NOT through Traefik)
|
||||||
# ports:
|
ports:
|
||||||
# - "4242:4242"
|
- "4242:4242"
|
||||||
|
|
||||||
synapse:
|
synapse:
|
||||||
image: ghcr.io/element-hq/synapse:latest
|
image: ghcr.io/element-hq/synapse:latest
|
||||||
|
|||||||
@@ -13,20 +13,17 @@ services:
|
|||||||
- "--certificatesresolvers.njalla.acme.storage=/letsencrypt/acme.json"
|
- "--certificatesresolvers.njalla.acme.storage=/letsencrypt/acme.json"
|
||||||
- "--certificatesresolvers.njalla.acme.httpchallenge.entrypoint=web"
|
- "--certificatesresolvers.njalla.acme.httpchallenge.entrypoint=web"
|
||||||
|
|
||||||
- "--log.level=INFO"
|
- "--log.level=DEBUG"
|
||||||
- "--log.filepath=/var/log/traefik/traefik.log"
|
|
||||||
- "--accesslog.filepath=/var/log/traefik/access.log"
|
|
||||||
- "--providers.docker=true"
|
- "--providers.docker=true"
|
||||||
- "--providers.docker.exposedByDefault=false"
|
- "--providers.docker.exposedByDefault=false"
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
environment:
|
environment:
|
||||||
- NJALLA_TOKEN=***
|
- NJALLA_TOKEN=${NJALLA_TOKEN}
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
- /mnt/HoardingCow_docker_data/Traefik:/letsencrypt
|
- /mnt/HoardingCow_docker_data/Traefik:/letsencrypt
|
||||||
- /var/log/traefik:/var/log/traefik
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- traefik_backend
|
- traefik_backend
|
||||||
|
|||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user