cesnimda/jobtrackingapp
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(deploy): make bundled Ollama opt-in to avoid duplicate container #2

Merged
cesnimda merged 1 commits from fix/ollama-no-duplicate into main 2026-07-03 15:06:23 +02:00
Conversation 0 Commits 1 Files Changed 2
+11 -3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1e508988a - Show all commits
deploy/deploy.sh
+3 -1
View File
@@ -61,7 +61,9 @@ fi
# Force recreation so updated port mappings, env vars, and container config always apply on deploy. # Force recreation so updated port mappings, env vars, and container config always apply on deploy.
compose up -d --force-recreate --remove-orphans backend frontend compose up -d --force-recreate --remove-orphans backend frontend
if [ "$DEPLOY_BUILD_AI_SERVICE" = "true" ]; then if [ "$DEPLOY_BUILD_AI_SERVICE" = "true" ]; then
compose up -d --force-recreate ai-service ollama # Ollama is opt-in (compose "bundled-ollama" profile). Deploys reuse an
# existing/shared Ollama via OLLAMA_BASE_URL instead of starting a duplicate.
compose up -d --force-recreate ai-service
fi fi
if [ -n "${OLLAMA_MODEL:-}" ]; then if [ -n "${OLLAMA_MODEL:-}" ]; then
docker-compose.yml
+8 -2
View File
@@ -75,12 +75,14 @@ services:
context: ./tools/summarizer context: ./tools/summarizer
dockerfile: Dockerfile dockerfile: Dockerfile
environment: environment:
# Point at an existing/shared Ollama by setting OLLAMA_BASE_URL in .env
# (e.g. http://<host-ip>:11435). The in-compose ollama service below is
# opt-in via the "bundled-ollama" profile, so it is NOT started by default
# and no duplicate Ollama container is created.
- OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://ollama:11434} - OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://ollama:11434}
- OLLAMA_MODEL=${OLLAMA_MODEL:-qwen2.5:7b} - OLLAMA_MODEL=${OLLAMA_MODEL:-qwen2.5:7b}
ports: ports:
- "8001:8001" - "8001:8001"
depends_on:
- ollama
networks: networks:
- default - default
- shared_services - shared_services
@@ -91,7 +93,11 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
# Opt-in only: start with `docker compose --profile bundled-ollama up`.
# Left out of the default set so deploys reuse an existing/shared Ollama
# (configured via OLLAMA_BASE_URL) instead of spinning up a duplicate.
ollama: ollama:
profiles: ["bundled-ollama"]
image: ollama/ollama:latest image: ollama/ollama:latest
ports: ports:
- "11434:11434" - "11434:11434"