chore(docker): cleanup

This commit is contained in:
Ray Andrew 2026-02-15 01:26:49 -06:00
parent abfa26e84a
commit 2a7f0653ac
Signed by: rayandrew
SSH key fingerprint: SHA256:EUCV+qCSqkap8rR+p+zGjxHfKI06G0GJKgo1DIOniQY
2 changed files with 14 additions and 89 deletions

View file

@ -4,19 +4,22 @@
# cp .env.example .env # cp .env.example .env
# ============================================ # ============================================
# --- new-api (LLM proxy) --- # --- LLM Gateway ---
# Admin password (used by init-channels.sh to login and configure channels) # Session secret (required for persistent sessions)
NEW_API_PASSWORD=change-me-after-first-login SESSION_SECRET=change-me-to-a-random-string
# Default admin (created on first run if no users exist)
ADMIN_USERNAME=admin
ADMIN_PASSWORD=change-me-min-8-chars
# Static API tokens (seeded on startup, leave empty to skip)
OPENWEBUI_API_KEY=sk-...
PERSONAL_API_KEY=sk-...
# Provider API keys
OPENROUTER_API_KEY=sk-or-... OPENROUTER_API_KEY=sk-or-...
SILICONFLOW_API_KEY=sk-... SILICONFLOW_API_KEY=sk-...
DEEPINFRA_API_KEY=... DEEPINFRA_API_KEY=...
GROQ_API_KEY=gsk_... GROQ_API_KEY=gsk_...
CEREBRAS_API_KEY=... CEREBRAS_API_KEY=...
# --- Open WebUI ---
# API token created in new-api (or via init-channels.sh)
OPENWEBUI_API_KEY=sk-...
# --- Grafana --- # --- Grafana ---
GRAFANA_ADMIN_PASSWORD=change-me-to-a-secure-password GRAFANA_ADMIN_PASSWORD=change-me-to-a-secure-password

View file

@ -1,5 +1,5 @@
services: services:
# ── Cache for SearXNG ── # ── Cache for SearXNG & LLM Gateway ──
valkey: valkey:
image: valkey/valkey:8-alpine image: valkey/valkey:8-alpine
command: valkey-server --save 30 1 --loglevel warning command: valkey-server --save 30 1 --loglevel warning
@ -38,69 +38,6 @@ services:
- ANONYMIZED_TELEMETRY=FALSE - ANONYMIZED_TELEMETRY=FALSE
restart: unless-stopped restart: unless-stopped
# # ── Database for LiteLLM (DEPRECATED — kept for rollback) ──
# litellm-db:
# image: postgres:16-alpine
# volumes:
# - litellm-db-data:/var/lib/postgresql/data
# environment:
# - POSTGRES_DB=litellm
# - POSTGRES_USER=litellm
# - POSTGRES_PASSWORD=${LITELLM_DB_PASSWORD}
# restart: unless-stopped
# healthcheck:
# test: ["CMD-SHELL", "pg_isready -U litellm"]
# interval: 10s
# timeout: 3s
# retries: 3
# # ── LLM API proxy (DEPRECATED — replaced by new-api) ──
# litellm:
# image: ghcr.io/berriai/litellm:main-latest
# command: ["--config", "/app/config.yaml", "--port", "4000"]
# volumes:
# - ./litellm/config.yaml:/app/config.yaml:ro
# ports:
# - "0.0.0.0:4000:4000"
# environment:
# - LITELLM_MASTER_KEY=${LITELLM_MASTER_KEY}
# - DATABASE_URL=postgresql://litellm:${LITELLM_DB_PASSWORD}@litellm-db:5432/litellm
# - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
# - SILICONFLOW_API_KEY=${SILICONFLOW_API_KEY}
# - DEEPINFRA_API_KEY=${DEEPINFRA_API_KEY}
# - GROQ_API_KEY=${GROQ_API_KEY}
# - CEREBRAS_API_KEY=${CEREBRAS_API_KEY}
# depends_on:
# litellm-db:
# condition: service_healthy
# restart: unless-stopped
# healthcheck:
# test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:4000/health/liveliness')"]
# interval: 15s
# timeout: 5s
# retries: 5
# start_period: 30s
# # ── LLM API proxy (DEPRECATED — replaced by llm-gateway) ──
# new-api:
# image: calciumion/new-api:latest
# ports:
# - "0.0.0.0:4000:3000"
# volumes:
# - new-api-data:/data
# environment:
# - SQL_DSN=
# - TZ=UTC
# - ENABLE_METRIC=true
# - LANG=en_US.UTF-8
# restart: unless-stopped
# healthcheck:
# test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://localhost:3000/"]
# interval: 15s
# timeout: 5s
# retries: 5
# start_period: 10s
# ── LLM API proxy ── # ── LLM API proxy ──
llm-gateway: llm-gateway:
build: ./llm-gateway build: ./llm-gateway
@ -110,7 +47,9 @@ services:
- llm-gateway-data:/data - llm-gateway-data:/data
- ./llm-gateway/configs/config.yaml:/etc/llm-gateway/config.yaml:ro - ./llm-gateway/configs/config.yaml:/etc/llm-gateway/config.yaml:ro
environment: environment:
- DASHBOARD_TOKEN=${DASHBOARD_TOKEN} - SESSION_SECRET=${SESSION_SECRET}
- ADMIN_USERNAME=${ADMIN_USERNAME}
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
- OPENWEBUI_API_KEY=${OPENWEBUI_API_KEY} - OPENWEBUI_API_KEY=${OPENWEBUI_API_KEY}
- PERSONAL_API_KEY=${PERSONAL_API_KEY} - PERSONAL_API_KEY=${PERSONAL_API_KEY}
- DEEPINFRA_API_KEY=${DEEPINFRA_API_KEY} - DEEPINFRA_API_KEY=${DEEPINFRA_API_KEY}
@ -194,20 +133,6 @@ services:
- "127.0.0.1:8428:8428" - "127.0.0.1:8428:8428"
restart: unless-stopped restart: unless-stopped
# # ── Dashboards (DEPRECATED — replaced by llm-gateway built-in dashboard) ──
# grafana:
# image: grafana/grafana:latest
# volumes:
# - grafana-data:/var/lib/grafana
# ports:
# - "0.0.0.0:3001:3000"
# environment:
# - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
# - GF_USERS_ALLOW_SIGN_UP=false
# depends_on:
# - victoriametrics
# restart: unless-stopped
# ── Host system metrics ── # ── Host system metrics ──
node-exporter: node-exporter:
image: prom/node-exporter:latest image: prom/node-exporter:latest
@ -236,10 +161,7 @@ services:
volumes: volumes:
valkey-data: valkey-data:
chromadb-data: chromadb-data:
litellm-db-data:
new-api-data:
llm-gateway-data: llm-gateway-data:
open-webui-data: open-webui-data:
tailscale-state: tailscale-state:
victoriametrics-data: victoriametrics-data:
grafana-data: