25c77ac794
Some checks failed
Release / semantic-release (push) Successful in 22s
tests / Unit tests (Linux, Python 3.11) (push) Successful in 9m55s
Release / build-linux (push) Failing after 7m36s
Release / build-windows (push) Has been cancelled
Release / build-macos (arm64, macos-latest) (push) Has been cancelled
Release / build-macos (x64, macos-15-intel) (push) Has been cancelled
Release / release-main (push) Has been cancelled
Release / release-develop (push) Has been cancelled
`docker compose up -d --build` now brings up the whole thing automatically — no host setup needed: - All-in-one javis image: TigerVNC+XFCE desktop, Chrome, Python brain bridge, Node/bun bot, managed by supervisord (verified: all 6 programs RUNNING). - ollama service + one-shot ollama-init that auto-pulls chat+embed models (verified end-to-end; `ollama list` shows pulled models). - Discord token deferred: without DISCORD_BOT_TOKEN the desktop, bridge, Ollama and models all run; only the bot waits (no crash loop). - Slim container deps (bridge/requirements-bridge.txt) drop the unused PyQt6/torch/chatterbox/sounddevice stack. Piper voice + Whisper models auto-download into named volumes. - Configurable host ports (VNC_PORT/NOVNC_PORT/BRIDGE_PORT) to avoid clashing with a host VNC already on 5901. Bridge binds 0.0.0.0 in-container. Verified: image builds; brain imports; bridge /health 200; noVNC 200; X display :1 @1920x1080; auto-pull completes; supervisorctl status all RUNNING.
85 lines
3.1 KiB
YAML
85 lines
3.1 KiB
YAML
# ============================================================================
|
|
# Javis Bot — Docker Compose
|
|
# ollama : the LLM backend for the jarvis brain
|
|
# ollama-init : one-shot, auto-pulls the chat + embed models on startup
|
|
# javis : all-in-one container (VNC desktop + Chrome + bridge + bot)
|
|
#
|
|
# Just bring it up — everything (incl. Ollama models) comes up automatically:
|
|
# docker compose up -d --build
|
|
#
|
|
# The Discord token can be added LAST: without it the desktop, brain bridge,
|
|
# Ollama and models all run; only the bot waits. Then put DISCORD_BOT_TOKEN in
|
|
# .env and re-run `docker compose up -d`.
|
|
#
|
|
# Watch the desktop: VNC viewer -> localhost:5901 (or browser -> localhost:6080)
|
|
# ============================================================================
|
|
services:
|
|
ollama:
|
|
image: ollama/ollama:latest
|
|
restart: unless-stopped
|
|
volumes:
|
|
- ollama_models:/root/.ollama
|
|
# --- GPU (optional): needs nvidia-container-toolkit on the host ---
|
|
# deploy:
|
|
# resources:
|
|
# reservations:
|
|
# devices:
|
|
# - driver: nvidia
|
|
# count: all
|
|
# capabilities: [gpu]
|
|
|
|
# Auto-pull the models the brain needs, then exit. Idempotent (re-runnable).
|
|
ollama-init:
|
|
image: ollama/ollama:latest
|
|
depends_on:
|
|
- ollama
|
|
restart: "no"
|
|
environment:
|
|
OLLAMA_HOST: http://ollama:11434
|
|
CHAT_MODEL: ${OLLAMA_CHAT_MODEL:-llama3.1:8b}
|
|
EMBED_MODEL: ${OLLAMA_EMBED_MODEL:-nomic-embed-text}
|
|
entrypoint: ["/bin/sh", "-c"]
|
|
command:
|
|
- |
|
|
echo "[ollama-init] waiting for ollama server...";
|
|
until ollama list >/dev/null 2>&1; do sleep 2; done;
|
|
echo "[ollama-init] pulling $$CHAT_MODEL";
|
|
ollama pull "$$CHAT_MODEL";
|
|
echo "[ollama-init] pulling $$EMBED_MODEL";
|
|
ollama pull "$$EMBED_MODEL";
|
|
echo "[ollama-init] models ready.";
|
|
|
|
javis:
|
|
build: .
|
|
restart: unless-stopped
|
|
env_file:
|
|
- path: .env
|
|
required: false
|
|
environment:
|
|
# Point the brain at the ollama service and the bot at the in-container bridge.
|
|
OLLAMA_BASE_URL: http://ollama:11434
|
|
OLLAMA_CHAT_MODEL: ${OLLAMA_CHAT_MODEL:-llama3.1:8b}
|
|
OLLAMA_EMBED_MODEL: ${OLLAMA_EMBED_MODEL:-nomic-embed-text}
|
|
WHISPER_MODEL: ${WHISPER_MODEL:-small}
|
|
BRIDGE_URL: http://127.0.0.1:8765
|
|
depends_on:
|
|
- ollama
|
|
shm_size: "1gb" # Chrome needs a larger /dev/shm
|
|
ports:
|
|
# Host ports are overridable. If the HOST already runs VNC on 5901
|
|
# (see docs/vnc-xfce-setup.md), set VNC_PORT=5902 in .env.
|
|
- "${VNC_PORT:-5901}:5901" # VNC
|
|
- "${NOVNC_PORT:-6080}:6080" # noVNC (open in a browser)
|
|
- "${BRIDGE_PORT:-8765}:8765" # brain bridge (usually internal-only)
|
|
volumes:
|
|
- javis_data:/data # jarvis db + memory
|
|
- whisper_cache:/root/.cache/huggingface # cached Whisper models
|
|
- piper_voices:/opt/piper-voices # TTS voices
|
|
# --- GPU (optional): mirror the ollama GPU block above to accelerate Whisper ---
|
|
|
|
volumes:
|
|
ollama_models:
|
|
javis_data:
|
|
whisper_cache:
|
|
piper_voices:
|