Compare commits
1 Commits
fix/remove
...
feat/7zz-c
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d2404d8f6 |
266
ai/compose.yml
Executable file → Normal file
266
ai/compose.yml
Executable file → Normal file
@@ -1,26 +1,50 @@
|
|||||||
|
version: "3.8"
|
||||||
services:
|
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"
|
||||||
|
|
||||||
|
# # 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"
|
||||||
|
|
||||||
hermes:
|
hermes:
|
||||||
build:
|
build:
|
||||||
context: ./hermes
|
context: ./hermes
|
||||||
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
|
||||||
environment:
|
environment:
|
||||||
- HERMES_UID=10000
|
- OLLAMA_HOST=http://ollama:11434
|
||||||
- HERMES_GID=10000
|
|
||||||
- OLLAMA_HOST=http://ollama-cpu:11434
|
|
||||||
- HERMES_DASHBOARD=1
|
|
||||||
- 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
|
||||||
- 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}
|
||||||
- OPENCODE_API_KEY=${OPENCODE_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
|
||||||
@@ -30,7 +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
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/opt/data/ExoKortex
|
# 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
|
||||||
@@ -39,32 +66,6 @@ services:
|
|||||||
- "26"
|
- "26"
|
||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
- ai_net
|
|
||||||
depends_on:
|
|
||||||
- honcho
|
|
||||||
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:
|
syncthing:
|
||||||
image: syncthing/syncthing:latest
|
image: syncthing/syncthing:latest
|
||||||
@@ -77,36 +78,30 @@ services:
|
|||||||
- "21027:21027/udp"
|
- "21027:21027/udp"
|
||||||
environment:
|
environment:
|
||||||
- TZ=America/Montreal
|
- TZ=America/Montreal
|
||||||
- PUID=10000
|
|
||||||
- PGID=10000
|
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/Syncthing/config:/var/syncthing/config
|
- /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/ExoKortex
|
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
|
||||||
|
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
|
||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
- ai_net
|
- ai_net
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.docker.network=ai_net"
|
|
||||||
|
|
||||||
- "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
|
- "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
|
||||||
- "traefik.http.routers.syncthing-http.entrypoints=web"
|
- "traefik.http.routers.syncthing-http.entrypoints=web"
|
||||||
- "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
|
- "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
|
||||||
|
|
||||||
- "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
|
- "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
|
||||||
- "traefik.http.routers.syncthing-https.entrypoints=websecure"
|
- "traefik.http.routers.syncthing-https.entrypoints=websecure"
|
||||||
- "traefik.http.routers.syncthing-https.tls=true"
|
- "traefik.http.routers.syncthing-https.tls=true"
|
||||||
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
||||||
- "traefik.http.routers.syncthing-https.middlewares=hermes-auth"
|
|
||||||
|
|
||||||
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
||||||
|
|
||||||
ollama-cpu:
|
ollama:
|
||||||
build:
|
build:
|
||||||
context: ./ollama
|
context: ./ollama
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
image: ollama/ollama:rocm-gfx906
|
image: ollama/ollama:rocm-gfx906
|
||||||
container_name: ollama-cpu
|
container_name: ollama
|
||||||
tty: true
|
tty: true
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
@@ -117,130 +112,73 @@ services:
|
|||||||
- /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
|
- /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
|
||||||
environment:
|
environment:
|
||||||
- OLLAMA_VULKAN=0
|
- OLLAMA_VULKAN=0
|
||||||
|
- 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
|
||||||
- OLLAMA_HOST=0.0.0.0
|
- OLLAMA_HOST=0.0.0.0
|
||||||
|
- OLLAMA_DEBUG=1
|
||||||
llama-cpp-hermes:
|
- OLLAMA_FLASH_ATTENTION=1
|
||||||
image: llama-cpp:rocm-gfx906
|
- OLLAMA_NUM_PARALLEL=2
|
||||||
container_name: llama-cpp-hermes
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:8300:8080"
|
|
||||||
ipc: host
|
|
||||||
devices:
|
devices:
|
||||||
|
# Map the render nodes and KFD for ROCm to work inside the container
|
||||||
- /dev/kfd:/dev/kfd
|
- /dev/kfd:/dev/kfd
|
||||||
- /dev/dri:/dev/dri
|
- /dev/dri:/dev/dri
|
||||||
group_add:
|
group_add:
|
||||||
- "303"
|
- "303"
|
||||||
- "26"
|
- "26"
|
||||||
environment:
|
|
||||||
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
|
||||||
- HSA_ENABLE_SDMA=0
|
|
||||||
- HIP_VISIBLE_DEVICES=0,1
|
|
||||||
- LLAMA_CACHE=/models
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
|
|
||||||
- /mnt/HoardingCow_docker_data/Ollama/ollama/models/blobs/sha256-17823599694fa3503ef54bf748d5078c6ce881f4d01616cafa255dc05d215a08:/model.gguf:ro
|
|
||||||
command: >
|
|
||||||
-m /model.gguf
|
|
||||||
--host 0.0.0.0
|
|
||||||
--port 8080
|
|
||||||
--gpu-layers 99
|
|
||||||
--ctx-size 163840
|
|
||||||
-ctk f16 -ctv f16
|
|
||||||
--flash-attn on
|
|
||||||
--split-mode layer
|
|
||||||
--no-mmap
|
|
||||||
--n-predict -1
|
|
||||||
|
|
||||||
# --- Honcho + OpenConcho combiné: API + Web UI nginx/FastAPI ---
|
|
||||||
honcho:
|
|
||||||
build:
|
|
||||||
context: ./honcho
|
|
||||||
ssh:
|
|
||||||
- default
|
|
||||||
container_name: honcho
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
- DB_CONNECTION_URI=postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho
|
|
||||||
- CACHE_URL=redis://honcho-redis:6379/0
|
|
||||||
- CACHE_ENABLED=true
|
|
||||||
- EMBEDDING_VECTOR_DIMENSIONS=1024
|
|
||||||
- AUTH_USE_AUTH=true
|
|
||||||
- AUTH_JWT_SECRET=${HONCHO_AUTH_JWT_SECRET}
|
|
||||||
# Needed by deriver/dream to make LLM calls (api_key_env = "HONCHO_OPENAI_API_KEY" in config.toml)
|
|
||||||
- HONCHO_OPENAI_API_KEY=${HONCHO_OPENAI_API_KEY}
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/data:/app/data
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/config.toml:/app/config.toml:ro
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
- ai_net
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.docker.network=ai_net"
|
|
||||||
|
|
||||||
# Router for HTTP + redirect to HTTPS
|
|
||||||
- "traefik.http.routers.honcho-http.rule=Host(`honcho.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.honcho-http.entrypoints=web"
|
|
||||||
- "traefik.http.routers.honcho-http.middlewares=redirect-to-https"
|
|
||||||
|
|
||||||
# Router for HTTPS with TLS — protected by Authelia
|
|
||||||
- "traefik.http.routers.honcho-https.rule=Host(`honcho.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.honcho-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.honcho-https.tls=true"
|
|
||||||
- "traefik.http.routers.honcho-https.tls.certresolver=njalla"
|
|
||||||
- "traefik.http.routers.honcho-https.middlewares=hermes-auth"
|
|
||||||
|
|
||||||
# Service Loadbalancer (nginx port)
|
|
||||||
- "traefik.http.services.honcho.loadbalancer.server.port=80"
|
|
||||||
depends_on:
|
|
||||||
- honcho-db
|
|
||||||
- honcho-redis
|
|
||||||
|
|
||||||
honcho-db:
|
|
||||||
image: pgvector/pgvector:pg15
|
|
||||||
container_name: honcho-db
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:5432:5432"
|
|
||||||
command: ["postgres", "-c", "max_connections=200"]
|
|
||||||
environment:
|
|
||||||
- POSTGRES_DB=honcho
|
|
||||||
- POSTGRES_USER=honcho
|
|
||||||
- POSTGRES_PASSWORD=honcho_pass
|
|
||||||
- PGDATA=/var/lib/postgresql/data/pgdata
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/postgres:/var/lib/postgresql/data
|
|
||||||
- ./honcho/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
|
|
||||||
honcho-redis:
|
|
||||||
image: redis:8
|
|
||||||
container_name: honcho-redis
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:6379:6379"
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/redis:/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: ai_net
|
name: ai_net
|
||||||
ai_backend:
|
ai_backend:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
name: ai_backend
|
name: ai_backend
|
||||||
|
|
||||||
volumes:
|
|
||||||
honcho_data:
|
|
||||||
driver: bridge
|
|
||||||
name: honcho_data
|
|
||||||
|
|
||||||
|
# llama_cpp_devstral:
|
||||||
|
# image: ghcr.io/ggml-org/llama.cpp:server-rocm
|
||||||
|
# container_name: llama_cpp_devstral
|
||||||
|
# restart: unless-stopped
|
||||||
|
# networks:
|
||||||
|
# - ai_backend
|
||||||
|
# ports:
|
||||||
|
# - "8300:8080"
|
||||||
|
# ipc: host
|
||||||
|
# devices:
|
||||||
|
# - "/dev/kfd:/dev/kfd"
|
||||||
|
# - "/dev/dri:/dev/dri"
|
||||||
|
# group_add:
|
||||||
|
# - "303" # video
|
||||||
|
# - "26" # render
|
||||||
|
# environment:
|
||||||
|
# HSA_OVERRIDE_GFX_VERSION: 9.0.6
|
||||||
|
# HIP_VISIBLE_DEVICES: 0,1
|
||||||
|
# LLAMA_CACHE: /models
|
||||||
|
# volumes:
|
||||||
|
# - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
|
||||||
|
# - /mnt/HoardingCow_docker_data/Llama_cpp/devstral-agent.jinja:/template.jinja
|
||||||
|
# command: >
|
||||||
|
# -hf unsloth/Devstral-Small-2-24B-Instruct-2512-GGUF:Devstral-Small-2-24B-Instruct-2512-Q8_0.gguf
|
||||||
|
# -a devstral-2-small-llama_cpp
|
||||||
|
# --chat-template-file /template.jinja
|
||||||
|
# --host 0.0.0.0
|
||||||
|
# --port 8080
|
||||||
|
# --n-gpu-layers 99
|
||||||
|
# --ctx-size 163840
|
||||||
|
# --batch-size 4096
|
||||||
|
# --ubatch-size 4096
|
||||||
|
# --cache-type-k f16
|
||||||
|
# --cache-type-v f16
|
||||||
|
# --cache-reuse 256
|
||||||
|
# --flash-attn on
|
||||||
|
# --context-shift
|
||||||
|
# --split-mode layer
|
||||||
|
# --no-mmap
|
||||||
|
# --n-predict -1
|
||||||
|
# --parallel 2
|
||||||
|
|
||||||
# vllm:
|
# vllm:
|
||||||
# image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
|
# image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
|
||||||
# container_name: vllm
|
# container_name: vllm
|
||||||
@@ -287,30 +225,6 @@ volumes:
|
|||||||
# - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
|
# - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
|
||||||
# restart: unless-stopped
|
# restart: unless-stopped
|
||||||
|
|
||||||
# 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 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"
|
|
||||||
|
|
||||||
# n8n:
|
# n8n:
|
||||||
# image: n8nio/n8n:latest
|
# image: n8nio/n8n:latest
|
||||||
# container_name: n8n
|
# container_name: n8n
|
||||||
|
|||||||
@@ -9,13 +9,37 @@
|
|||||||
# ---------- 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
|
||||||
|
|
||||||
|
# ---------- Overlay our forked source ----------
|
||||||
|
# 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.
|
||||||
|
# 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 ----------
|
# ---------- 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 \
|
||||||
gosu \
|
|
||||||
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 && \
|
||||||
@@ -24,14 +48,6 @@ 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/
|
||||||
|
|
||||||
WORKDIR /opt/hermes
|
|
||||||
|
|
||||||
# ---------- 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 && \
|
||||||
@@ -59,6 +75,43 @@ os.remove(tgz)
|
|||||||
print('himalaya v1.2.0 installed')
|
print('himalaya v1.2.0 installed')
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
|
# ---------- Install himalaya-ro wrapper ----------
|
||||||
|
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||||
|
|
||||||
|
|
||||||
|
# ---------- Install 7-Zip (7zz) for CHM extraction ----------
|
||||||
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
|
import urllib.request, tarfile, os, shutil, re, subprocess
|
||||||
|
|
||||||
|
# Scrape 7-zip.org for latest Linux x64 binary link
|
||||||
|
url = 'https://7-zip.org/download.html'
|
||||||
|
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
|
r = urllib.request.urlopen(req, timeout=15)
|
||||||
|
html = r.read().decode()
|
||||||
|
match = re.search(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
|
||||||
|
if not match:
|
||||||
|
raise RuntimeError('Could not find 7z Linux x64 download link on 7-zip.org')
|
||||||
|
dl_url = f'https://7-zip.org/{match.group(1)}'
|
||||||
|
|
||||||
|
# Follow Himalaya pattern: download, extract, install, verify
|
||||||
|
xz = '/tmp/7z.tar.xz'
|
||||||
|
urllib.request.urlretrieve(dl_url, xz)
|
||||||
|
os.makedirs('/tmp/7z', exist_ok=True)
|
||||||
|
with tarfile.open(xz, 'r:xz') as t:
|
||||||
|
t.extractall('/tmp/7z')
|
||||||
|
shutil.move('/tmp/7z/7zz', '/usr/local/bin/7zz')
|
||||||
|
os.chmod('/usr/local/bin/7zz', 0o755)
|
||||||
|
shutil.rmtree('/tmp/7z', ignore_errors=True)
|
||||||
|
os.remove(xz)
|
||||||
|
|
||||||
|
# Verify
|
||||||
|
result = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
|
||||||
|
assert result.returncode == 0, f'7zz verify failed: {result.stderr}'
|
||||||
|
version = result.stdout.split()[2] if result.stdout else 'unknown'
|
||||||
|
print(f'7-Zip {version} installed successfully')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
@@ -68,12 +121,6 @@ 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" ]
|
||||||
|
|
||||||
# Switch to the hermes user so the container runs unprivileged.
|
|
||||||
# All child processes inherit this user — no more orphan root processes
|
|
||||||
# that escape gosu privilege drops in the entrypoint.
|
|
||||||
USER hermes
|
|
||||||
73
ai/hermes/himalaya-ro.sh
Normal file
73
ai/hermes/himalaya-ro.sh
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# ─────────────────────────────────────────────────────────────
|
||||||
|
# himalaya-ro — Read-only wrapper for himalaya
|
||||||
|
#
|
||||||
|
# Blocks destructive commands and logs audit trail.
|
||||||
|
# Pass-through for read-only commands (list, read, search).
|
||||||
|
#
|
||||||
|
# Usage: himalaya-ro [options] <command> [args...]
|
||||||
|
#
|
||||||
|
# Install: place in PATH before the real himalaya, or use
|
||||||
|
# `ln -sf himalaya-ro /usr/local/bin/himalaya`
|
||||||
|
# ─────────────────────────────────────────────────────────────
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
# ── Configuration ───────────────────────────────────────────
|
||||||
|
HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
|
||||||
|
AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
|
||||||
|
|
||||||
|
# ── Destructive commands we block ──────────────────────────
|
||||||
|
BLOCKED_CMDS=(
|
||||||
|
"message move"
|
||||||
|
"message delete"
|
||||||
|
"message copy"
|
||||||
|
"flag add"
|
||||||
|
"flag remove"
|
||||||
|
"folder create"
|
||||||
|
"folder delete"
|
||||||
|
"folder rename"
|
||||||
|
"template send"
|
||||||
|
"account configure"
|
||||||
|
"account delete"
|
||||||
|
)
|
||||||
|
|
||||||
|
# ── Determine the subcommand being invoked ─────────────────
|
||||||
|
# Strip leading options (--account, --output, etc.) to find the verb
|
||||||
|
ARGS=()
|
||||||
|
SKIP_NEXT=false
|
||||||
|
for arg in "$@"; do
|
||||||
|
if $SKIP_NEXT; then
|
||||||
|
SKIP_NEXT=false
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
if [[ "$arg" == --* ]]; then
|
||||||
|
case "$arg" in
|
||||||
|
--account|--output|--page|--page-size|--folder|--color|--format)
|
||||||
|
SKIP_NEXT=true ;;
|
||||||
|
esac
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
ARGS+=("$arg")
|
||||||
|
done
|
||||||
|
|
||||||
|
# Build subcommand string and check against blocklist
|
||||||
|
CMD_STR=""
|
||||||
|
for ((i=0; i<${#ARGS[@]}; i++)); do
|
||||||
|
if [ -z "$CMD_STR" ]; then
|
||||||
|
CMD_STR="${ARGS[$i]}"
|
||||||
|
else
|
||||||
|
CMD_STR="$CMD_STR ${ARGS[$i]}"
|
||||||
|
fi
|
||||||
|
for blocked in "${BLOCKED_CMDS[@]}"; do
|
||||||
|
if [[ "$CMD_STR" == "$blocked" ]]; then
|
||||||
|
TS=$(date '+%Y-%m-%d %H:%M:%S')
|
||||||
|
echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
|
||||||
|
echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
|
||||||
|
echo " Audit log: $AUDIT_LOG" >&2
|
||||||
|
exit 100
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
# ── Allow pass-through ─────────────────────────────────────
|
||||||
|
exec "$HIMALAYA_BIN" "$@"
|
||||||
181
ai/hermes/patch_tts_tool.py
Normal file
181
ai/hermes/patch_tts_tool.py
Normal file
@@ -0,0 +1,181 @@
|
|||||||
|
#!/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,76 +0,0 @@
|
|||||||
# build stage — fetches and builds Honcho from source
|
|
||||||
FROM python:3.13-slim-bookworm AS honcho-builder
|
|
||||||
|
|
||||||
RUN apt-get update && \
|
|
||||||
apt-get install -y --no-install-recommends git openssh-client && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=ghcr.io/astral-sh/uv:0.9.24 /uv /bin/uv
|
|
||||||
|
|
||||||
ARG HONCHO_REPO=ssh://git@code.lazyworkhorse.net:2222/Hermes/honcho.git
|
|
||||||
ARG HONCHO_REF=main
|
|
||||||
RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan -p 2222 code.lazyworkhorse.net >> ~/.ssh/known_hosts 2>/dev/null
|
|
||||||
RUN --mount=type=ssh git clone --depth 1 --branch ${HONCHO_REF} ${HONCHO_REPO} /app
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
ENV UV_COMPILE_BYTECODE=1
|
|
||||||
ENV UV_LINK_MODE=copy
|
|
||||||
ENV UV_PYTHON=/usr/local/bin/python3.13
|
|
||||||
|
|
||||||
RUN uv sync --frozen
|
|
||||||
|
|
||||||
# build stage — builds OpenConcho SPA
|
|
||||||
FROM node:22-bookworm AS openconcho-builder
|
|
||||||
|
|
||||||
ENV PNPM_HOME=/pnpm
|
|
||||||
ENV PATH=$PNPM_HOME:$PATH
|
|
||||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
RUN apt-get update && apt-get install -y git openssh-client && rm -rf /var/lib/apt/lists/**
|
|
||||||
|
|
||||||
ARG OPENCONCHO_SHA=148766312e6a5256f399c64171854f0ff6173b6d
|
|
||||||
RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan -p 2222 code.lazyworkhorse.net >> ~/.ssh/known_hosts 2>/dev/null
|
|
||||||
RUN --mount=type=ssh git clone --depth 1 ssh://git@code.lazyworkhorse.net:2222/gortium/openconcho.git /app && \
|
|
||||||
git -C /app fetch --depth 1 origin ${OPENCONCHO_SHA} && \
|
|
||||||
git -C /app checkout ${OPENCONCHO_SHA}
|
|
||||||
|
|
||||||
RUN pnpm install --frozen-lockfile
|
|
||||||
RUN pnpm --filter @openconcho/web build
|
|
||||||
|
|
||||||
# runtime stage — nginx + Honcho FastAPI
|
|
||||||
FROM python:3.13-slim-bookworm
|
|
||||||
|
|
||||||
# Install nginx and create runtime dirs before dropping permissions
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends nginx && \
|
|
||||||
rm -rf /var/log/nginx/* && \
|
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
|
||||||
rm -f /etc/nginx/sites-enabled/default
|
|
||||||
|
|
||||||
# Patch nginx.conf: comment out "user www-data;" so nginx master stays as root
|
|
||||||
# (workers inherit root inside a container — fine for single-service isolation)
|
|
||||||
RUN sed -i 's/^user /# user /' /etc/nginx/nginx.conf
|
|
||||||
|
|
||||||
# Pre-create nginx runtime directories with proper ownership
|
|
||||||
RUN mkdir -p /var/lib/nginx/body /var/lib/nginx/proxy /var/lib/nginx/fastcgi \
|
|
||||||
/var/lib/nginx/uwsgi /var/lib/nginx/scgi /var/lib/nginx/proxy_temp \
|
|
||||||
/var/cache/nginx && \
|
|
||||||
chown -R root:root /var/lib/nginx /var/cache/nginx
|
|
||||||
|
|
||||||
# Honcho
|
|
||||||
COPY --from=honcho-builder /app /app
|
|
||||||
WORKDIR /app
|
|
||||||
ENV PATH="/app/.venv/bin:$PATH"
|
|
||||||
ENV HOME=/app
|
|
||||||
COPY config.toml /app/config.toml
|
|
||||||
|
|
||||||
# OpenConcho SPA
|
|
||||||
COPY --from=openconcho-builder /app/packages/web/dist /usr/share/nginx/html
|
|
||||||
|
|
||||||
# nginx config (proxies /v3/, /v2/ to Honcho on localhost:8000)
|
|
||||||
COPY honcho-nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
EXPOSE 80
|
|
||||||
|
|
||||||
CMD ["bash", "-c", "nginx -g 'daemon off;' & fastapi run --host 127.0.0.1 --port 8000 src/main.py & python3 -m src.deriver & wait -n"]
|
|
||||||
@@ -1,132 +0,0 @@
|
|||||||
[app]
|
|
||||||
LOG_LEVEL = "INFO"
|
|
||||||
MAX_MESSAGE_SIZE = 25000
|
|
||||||
EMBED_MESSAGES = true
|
|
||||||
NAMESPACE = "honcho"
|
|
||||||
|
|
||||||
[db]
|
|
||||||
CONNECTION_URI = "postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho"
|
|
||||||
SCHEMA = "public"
|
|
||||||
POOL_SIZE = 10
|
|
||||||
MAX_OVERFLOW = 20
|
|
||||||
|
|
||||||
[auth]
|
|
||||||
USE_AUTH = false
|
|
||||||
|
|
||||||
[sentry]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
[telemetry]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
[webhook]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
[cache]
|
|
||||||
ENABLED = true
|
|
||||||
URL = "redis://honcho-redis:6379/0"
|
|
||||||
|
|
||||||
[llm]
|
|
||||||
DEFAULT_MAX_TOKENS = 4096
|
|
||||||
|
|
||||||
# Embeddings via Ollama — bge-m3 provides 1024-dim
|
|
||||||
[embedding]
|
|
||||||
VECTOR_DIMENSIONS = 1024
|
|
||||||
MAX_INPUT_TOKENS = 8192
|
|
||||||
|
|
||||||
[embedding.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "bge-m3"
|
|
||||||
overrides = {base_url = "http://ollama:11434/v1", api_key = "ollama"}
|
|
||||||
|
|
||||||
# --- Deriver ---
|
|
||||||
[deriver]
|
|
||||||
ENABLED = true
|
|
||||||
WORKERS = 1
|
|
||||||
POLLING_SLEEP_INTERVAL_SECONDS = 5.0
|
|
||||||
FLUSH_ENABLED = true
|
|
||||||
|
|
||||||
[deriver.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
# --- Dialectic ---
|
|
||||||
[dialectic]
|
|
||||||
MAX_INPUT_TOKENS = 4096
|
|
||||||
SESSION_HISTORY_MAX_TOKENS = 8192
|
|
||||||
|
|
||||||
[dialectic.levels.minimal]
|
|
||||||
MAX_TOOL_ITERATIONS = 1
|
|
||||||
MAX_OUTPUT_TOKENS = 512
|
|
||||||
[dialectic.levels.minimal.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
[dialectic.levels.low]
|
|
||||||
MAX_TOOL_ITERATIONS = 3
|
|
||||||
[dialectic.levels.low.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
[dialectic.levels.medium]
|
|
||||||
MAX_TOOL_ITERATIONS = 2
|
|
||||||
[dialectic.levels.medium.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
[dialectic.levels.high]
|
|
||||||
MAX_TOOL_ITERATIONS = 4
|
|
||||||
[dialectic.levels.high.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
[dialectic.levels.max]
|
|
||||||
MAX_TOOL_ITERATIONS = 10
|
|
||||||
[dialectic.levels.max.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
# --- Summary ---
|
|
||||||
[summary]
|
|
||||||
ENABLED = true
|
|
||||||
MESSAGES_PER_SHORT_SUMMARY = 20
|
|
||||||
MESSAGES_PER_LONG_SUMMARY = 60
|
|
||||||
|
|
||||||
[summary.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
# --- Dream ---
|
|
||||||
[dream]
|
|
||||||
ENABLED = true
|
|
||||||
|
|
||||||
[dream.model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
[dream.deduction_model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
[dream.induction_model_config]
|
|
||||||
overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
|
|
||||||
transport = "openai"
|
|
||||||
model = "deepseek-v4-flash"
|
|
||||||
|
|
||||||
# --- Peer Card ---
|
|
||||||
[peer_card]
|
|
||||||
ENABLED = true
|
|
||||||
|
|
||||||
# --- Vector Store ---
|
|
||||||
[vector_store]
|
|
||||||
TYPE = "pgvector"
|
|
||||||
# DIMENSIONS is deprecated — EMBEDDING.VECTOR_DIMENSIONS is authoritative
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80 default_server;
|
|
||||||
listen [::]:80 default_server;
|
|
||||||
server_name _;
|
|
||||||
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
|
|
||||||
# Honcho API proxy
|
|
||||||
location /v3/ {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /v2/ {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Honcho health
|
|
||||||
location /health {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# OpenAPI docs
|
|
||||||
location /openapi.json {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# SPA: fallback to index.html for client-side routing
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CREATE EXTENSION IF NOT EXISTS vector;
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
# llama-cpp-rocm6/Dockerfile
|
|
||||||
# Custom llama.cpp server with ROCm 6.1 + gfx906 (MI50) support.
|
|
||||||
# Build: docker build -t llama-cpp:rocm-gfx906 .
|
|
||||||
# NOTE: Update LLAMACPP_VERSION for bugfixes, but verify ROCm 6.1 compat
|
|
||||||
# by checking if recent releases still support -DGGML_HIP=ON.
|
|
||||||
|
|
||||||
FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl git build-essential pkg-config cmake make && rm -rf /var/lib/apt/lists/*
|
|
||||||
ARG LLAMACPP_VERSION=b9890
|
|
||||||
RUN git clone --depth 1 --branch ${LLAMACPP_VERSION} https://github.com/ggml-org/llama.cpp.git /build
|
|
||||||
WORKDIR /build
|
|
||||||
ENV HIP_PATH=/opt/rocm ROCM_PATH=/opt/rocm PATH=/opt/rocm/bin:/opt/rocm/llvm/bin:${PATH} CMAKE_PREFIX_PATH=/opt/rocm
|
|
||||||
RUN mkdir build && cd build && \
|
|
||||||
cmake .. -DGGML_HIP=ON -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DAMDGPU_TARGETS="gfx906:xnack-" \
|
|
||||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
|
||||||
-DGGML_CUDA=OFF -DGGML_VULKAN=OFF -DGGML_METAL=OFF \
|
|
||||||
-DBUILD_SHARED_LIBS=OFF && \
|
|
||||||
cmake --build . --target llama-server -- -j $(nproc)
|
|
||||||
|
|
||||||
FROM ubuntu:24.04
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
ca-certificates curl libstdc++6 libgomp1 libopenblas0 \
|
|
||||||
libnuma1 libelf1 libdrm2 libdrm-amdgpu1 \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
|
|
||||||
COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
|
|
||||||
COPY --from=builder /build/build/bin/llama-server /usr/local/bin/llama-server
|
|
||||||
RUN echo /opt/rocm/lib > /etc/ld.so.conf.d/rocm.conf && ldconfig
|
|
||||||
ENV HSA_OVERRIDE_GFX_VERSION=9.0.6 HCC_AMDGPU_TARGET=gfx906 HSA_ENABLE_SDMA=0
|
|
||||||
EXPOSE 8080
|
|
||||||
ENTRYPOINT ["/usr/local/bin/llama-server"]
|
|
||||||
@@ -32,5 +32,5 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
auth_net:
|
auth_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: auth_net
|
name: auth_net
|
||||||
|
|||||||
@@ -68,33 +68,33 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
- "traefik.enable=false" # Internal only, accessed by restic-browser
|
- "traefik.enable=false" # Internal only, accessed by restic-browser
|
||||||
|
|
||||||
# restic-browser:
|
restic-browser:
|
||||||
# image: mazzolino/restic-browser:latest
|
image: embergarage/restic-browser:latest
|
||||||
# container_name: restic-browser
|
container_name: restic-browser
|
||||||
# restart: always
|
restart: always
|
||||||
# environment:
|
environment:
|
||||||
# - TZ=America/Montreal
|
- TZ=America/Montreal
|
||||||
# - RESTIC_REPOSITORY=http://restic-server:8080
|
- RESTIC_REPOSITORY=http://restic-server:8080
|
||||||
# - RESTIC_PASSWORD=${RESTIC_PASSWORD}
|
- RESTIC_PASSWORD=${RESTIC_PASSWORD}
|
||||||
# networks:
|
networks:
|
||||||
# - backup_net
|
- backup_net
|
||||||
# labels:
|
labels:
|
||||||
# - "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
# # 1. HTTP to HTTPS Redirect
|
# 1. HTTP to HTTPS Redirect
|
||||||
# - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
|
- "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
|
||||||
# - "traefik.http.routers.restic-browser-http.entrypoints=web"
|
- "traefik.http.routers.restic-browser-http.entrypoints=web"
|
||||||
# - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
|
- "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
|
||||||
#
|
|
||||||
# # 2. HTTPS Configuration
|
# 2. HTTPS Configuration
|
||||||
# - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
|
- "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
|
||||||
# - "traefik.http.routers.restic-browser.entrypoints=websecure"
|
- "traefik.http.routers.restic-browser.entrypoints=websecure"
|
||||||
# - "traefik.http.routers.restic-browser.tls=true"
|
- "traefik.http.routers.restic-browser.tls=true"
|
||||||
# - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
|
- "traefik.http.routers.restic-browser.tls.certresolver=njalla"
|
||||||
#
|
|
||||||
# # 3. Backend Service Config
|
# 3. Backend Service Config
|
||||||
# - "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
|
- "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
backup_net:
|
backup_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: backup_net
|
name: backup_net
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- cloud_net
|
- cloud_net
|
||||||
- cloud_internal
|
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
@@ -52,7 +51,7 @@ services:
|
|||||||
container_name: nextcloud_cron
|
container_name: nextcloud_cron
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- cloud_internal
|
- cloud_net
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/NextCloud/data:/var/www/html:rw
|
- /mnt/HoardingCow_docker_data/NextCloud/data:/var/www/html:rw
|
||||||
@@ -76,7 +75,7 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
cloud_net:
|
cloud_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: cloud_net
|
name: cloud_net
|
||||||
cloud_internal:
|
cloud_internal:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
coms_net:
|
coms_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: coms_net
|
name: coms_net
|
||||||
coms_backend:
|
coms_backend:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
|
|||||||
@@ -37,5 +37,4 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
finance_net:
|
finance_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: finance_net
|
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Home_Assistant:/config:rw
|
- /mnt/HoardingCow_docker_data/Home_Assistant:/config:rw
|
||||||
networks:
|
networks:
|
||||||
- home_net
|
- home_auto_net
|
||||||
- home_backend
|
- home_auto_backend
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Mosquitto:/mosquitto
|
- /mnt/HoardingCow_docker_data/Mosquitto:/mosquitto
|
||||||
networks:
|
networks:
|
||||||
- home_backend
|
- home_auto_backend
|
||||||
# ports:
|
# ports:
|
||||||
# - 1883:1883
|
# - 1883:1883
|
||||||
# - 9001:9001
|
# - 9001:9001
|
||||||
@@ -43,7 +43,7 @@ services:
|
|||||||
image: registry.gitlab.com/hydroqc/hydroqc2mqtt:1.3.0
|
image: registry.gitlab.com/hydroqc/hydroqc2mqtt:1.3.0
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- home_backend
|
- home_auto_backend
|
||||||
environment:
|
environment:
|
||||||
MQTT_USERNAME: hass
|
MQTT_USERNAME: hass
|
||||||
MQTT_PASSWORD: ${MQTT_PASSWORD}
|
MQTT_PASSWORD: ${MQTT_PASSWORD}
|
||||||
@@ -88,9 +88,8 @@ services:
|
|||||||
# restart: unless-stopped
|
# restart: unless-stopped
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
home_net:
|
home_auto_net:
|
||||||
|
external: true
|
||||||
|
home_auto_backend:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
name: home_net
|
name: home_auto_backend
|
||||||
home_backend:
|
|
||||||
driver: bridge
|
|
||||||
name: home_backend
|
|
||||||
|
|||||||
@@ -38,5 +38,4 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
homepage_net:
|
homepage_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: homepage_net
|
|
||||||
|
|||||||
@@ -36,9 +36,9 @@ services:
|
|||||||
- cloud_net
|
- cloud_net
|
||||||
- coms_net
|
- coms_net
|
||||||
- finance_net
|
- finance_net
|
||||||
- home_net
|
- home_auto_net
|
||||||
- homepage_net
|
- homepage_net
|
||||||
- pass_net
|
- passman_net
|
||||||
- tak_net
|
- tak_net
|
||||||
- vc_net
|
- vc_net
|
||||||
|
|
||||||
@@ -82,37 +82,37 @@ networks:
|
|||||||
driver: bridge
|
driver: bridge
|
||||||
name: traefik_backend
|
name: traefik_backend
|
||||||
ai_net:
|
ai_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: ai_net
|
name: ai_net
|
||||||
auth_net:
|
auth_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: auth_net
|
name: auth_net
|
||||||
backup_net:
|
backup_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: backup_net
|
name: backup_net
|
||||||
cloud_net:
|
cloud_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: cloud_net
|
name: cloud_net
|
||||||
coms_net:
|
coms_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: coms_net
|
name: coms_net
|
||||||
finance_net:
|
finance_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: finance_net
|
name: finance_net
|
||||||
home_net:
|
home_auto_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: home_net
|
name: home_auto_net
|
||||||
homepage_net:
|
homepage_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: homepage_net
|
name: homepage_net
|
||||||
pass_net:
|
passman_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: pass_net
|
name: passman_net
|
||||||
tak_net:
|
tak_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: tak_net
|
name: tak_net
|
||||||
vc_net:
|
vc_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: vc_net
|
name: vc_net
|
||||||
|
|
||||||
# duckdns:
|
# duckdns:
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/BitWarden/data:/data:rw
|
- /mnt/HoardingCow_docker_data/BitWarden/data:/data:rw
|
||||||
networks:
|
networks:
|
||||||
- pass_net
|
- passman_net
|
||||||
restart: always
|
restart: always
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
@@ -32,6 +32,5 @@ services:
|
|||||||
# Internal service
|
# Internal service
|
||||||
- "traefik.http.services.pass.loadbalancer.server.port=80"
|
- "traefik.http.services.pass.loadbalancer.server.port=80"
|
||||||
networks:
|
networks:
|
||||||
pass_net:
|
passman_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: pass_net
|
|
||||||
|
|||||||
@@ -92,8 +92,7 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
tak_net:
|
tak_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: tak_net
|
|
||||||
tak_backend:
|
tak_backend:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
name: tak_backend
|
name: tak_backend
|
||||||
|
|||||||
@@ -61,5 +61,4 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
vc_net:
|
vc_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: vc_net
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ services:
|
|||||||
- SYS_MODULE
|
- SYS_MODULE
|
||||||
environment:
|
environment:
|
||||||
- WG_HOST=vpn.lazyworkhorse.net
|
- WG_HOST=vpn.lazyworkhorse.net
|
||||||
- PASSWORD_HASH=${WG_PASSWORD_HASH}
|
- PASSWORD=${WG_PASSWORD}
|
||||||
- WG_PORT=51820
|
- WG_PORT=51820
|
||||||
- WG_DEFAULT_ADDRESS=10.8.0.x
|
- WG_DEFAULT_ADDRESS=10.8.0.x
|
||||||
- WG_DEFAULT_DNS=1.1.1.1,8.8.8.8
|
- WG_DEFAULT_DNS=1.1.1.1,8.8.8.8
|
||||||
@@ -22,6 +22,7 @@ services:
|
|||||||
- UI_CHART_TYPE=0
|
- UI_CHART_TYPE=0
|
||||||
ports:
|
ports:
|
||||||
- "51820:51820/udp"
|
- "51820:51820/udp"
|
||||||
|
- "51821:51821/tcp"
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/WireGuard:/etc/wireguard:rw
|
- /mnt/HoardingCow_docker_data/WireGuard:/etc/wireguard:rw
|
||||||
sysctls:
|
sysctls:
|
||||||
@@ -30,31 +31,8 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- vpn_net
|
- vpn_net
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
|
|
||||||
# HTTP → HTTPS redirect
|
|
||||||
- "traefik.http.routers.wireguard-http.rule=Host(vpn.lazyworkhorse.net)"
|
|
||||||
- "traefik.http.routers.wireguard-http.entrypoints=web"
|
|
||||||
- "traefik.http.routers.wireguard-http.middlewares=redirect-to-https"
|
|
||||||
- "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
|
|
||||||
|
|
||||||
# HTTPS router — protégé par Authelia
|
|
||||||
- "traefik.http.routers.wireguard-https.rule=Host(vpn.lazyworkhorse.net)"
|
|
||||||
- "traefik.http.routers.wireguard-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.wireguard-https.tls=true"
|
|
||||||
- "traefik.http.routers.wireguard-https.tls.certresolver=njalla"
|
|
||||||
- "traefik.http.routers.wireguard-https.middlewares=wireguard-auth"
|
|
||||||
|
|
||||||
# Authelia forwardAuth
|
|
||||||
- "traefik.http.middlewares.wireguard-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
|
|
||||||
- "traefik.http.middlewares.wireguard-auth.forwardauth.trustforwardheader=true"
|
|
||||||
- "traefik.http.middlewares.wireguard-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
|
|
||||||
|
|
||||||
# Port interne du web UI wg-easy
|
|
||||||
- "traefik.http.services.wireguard.loadbalancer.server.port=51821"
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
vpn_net:
|
vpn_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: vpn_net
|
name: vpn_net
|
||||||
|
|||||||
Reference in New Issue
Block a user