mirror of
https://github.com/open-jarvis/OpenJarvis.git
synced 2026-07-28 05:12:26 +00:00
16f601c7d7
* feat: nvidia gpu config for docker * refactor: split NVIDIA GPU support into compose override Address review feedback: - Revert --engine ollama from base Dockerfile CMD (breaks non-Ollama users) - Keep bookworm pin and OLLAMA_HOST fix in base config - Move GPU-specific config (/proc, /sys mounts, deploy.resources.reservations) into new docker-compose.gpu.nvidia.yml override, matching the existing ROCm pattern (docker-compose.gpu.rocm.yml) - Restore Ollama port to standard 11434 - Remove commented-out GPU blocks from base docker-compose.yml - Add Ollama healthcheck with depends_on condition to base compose - Remove run.sh from repo root - Rewrite README Docker section to document CPU, NVIDIA, and ROCm patterns Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Jon Saad-Falcon <41205309+jonsaadfalcon@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
32 lines
631 B
YAML
32 lines
631 B
YAML
services:
|
|
jarvis:
|
|
build:
|
|
context: ../..
|
|
dockerfile: deploy/docker/Dockerfile
|
|
ports:
|
|
- "8000:8000"
|
|
environment:
|
|
- OPENJARVIS_ENGINE_DEFAULT=ollama
|
|
- OLLAMA_HOST=http://ollama:11434
|
|
depends_on:
|
|
ollama:
|
|
condition: service_healthy
|
|
restart: unless-stopped
|
|
|
|
ollama:
|
|
image: ollama/ollama:latest
|
|
ports:
|
|
- "11434:11434"
|
|
volumes:
|
|
- ollama-models:/root/.ollama
|
|
healthcheck:
|
|
test: ["CMD", "ollama", "list"]
|
|
interval: 5s
|
|
timeout: 3s
|
|
retries: 10
|
|
start_period: 10s
|
|
restart: unless-stopped
|
|
|
|
volumes:
|
|
ollama-models:
|