Merge branch 'master' into feat/hermes43-llamacpp
Conflicts resolved: - hermes env: keep OLLAMA_HOST=ollama-cpu + master's new vars - ollama→ollama-cpu rename: keep our rename over master's ollama
This commit is contained in:
126
ai/compose.yml
Normal file → Executable file
126
ai/compose.yml
Normal file → Executable file
@@ -1,4 +1,3 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
|
||||
# webui:
|
||||
@@ -32,19 +31,25 @@ services:
|
||||
- default
|
||||
container_name: hermes
|
||||
entrypoint: ["/bin/bash", "-c",
|
||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"hermes-entrypoint"]
|
||||
restart: always
|
||||
# Gateway run enables the internal API server on port 8642
|
||||
command: gateway run
|
||||
environment:
|
||||
- OLLAMA_HOST=http://ollama-cpu:11434
|
||||
- HERMES_DASHBOARD=1
|
||||
# Multi-profile: comma-separated list of profiles to run as gateways.
|
||||
# The entrypoint reads this and starts one gateway per profile.
|
||||
# Add profiles here when they exist on disk (e.g. default,researcher,writer)
|
||||
- HERMES_PROFILES=ashley,claire,finn,matt,paul
|
||||
- API_SERVER_ENABLED=true
|
||||
- API_SERVER_PORT=8642
|
||||
- API_SERVER_HOST=0.0.0.0
|
||||
- API_SERVER_KEY=hermes_local_key
|
||||
- GATEWAY_ALLOW_ALL_USERS=true
|
||||
- OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
|
||||
- OPENCODE_API_KEY=${OPENCODE_API_KEY}
|
||||
# ROCm for GPU-accelerated faster-whisper STT
|
||||
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
||||
- HCC_AMDGPU_TARGET=gfx906
|
||||
@@ -66,6 +71,32 @@ services:
|
||||
- "26"
|
||||
networks:
|
||||
- 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:
|
||||
image: syncthing/syncthing:latest
|
||||
@@ -149,6 +180,92 @@ services:
|
||||
--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:
|
||||
condition: service_healthy
|
||||
honcho-redis:
|
||||
condition: service_healthy
|
||||
|
||||
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
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U honcho -d honcho"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
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
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "redis-cli ping"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
networks:
|
||||
ai_net:
|
||||
external: true
|
||||
@@ -156,6 +273,11 @@ networks:
|
||||
ai_backend:
|
||||
driver: bridge
|
||||
name: ai_backend
|
||||
|
||||
volumes:
|
||||
honcho_data:
|
||||
external: true
|
||||
name: honcho_data
|
||||
|
||||
# vllm:
|
||||
# image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
|
||||
|
||||
Reference in New Issue
Block a user