From 70dc396fe39ffd6cb4b1ee7ccb25066864d0b75a Mon Sep 17 00:00:00 2001 From: Santhosh Janardhanan Date: Mon, 13 Apr 2026 01:06:23 -0400 Subject: [PATCH] fix: remove hardcoded secrets from docker-compose, use env vars + profiles - Remove hardcoded OpenRouter API key and URL from docker-compose.yml - App service now reads OPENAI_* vars from .env file (env_file) and falls back to http://ollama:11434/v1 defaults - Ollama and model-init moved to 'ollama' Docker Compose profile, so they only start when explicitly requested: docker compose --profile ollama up # with local Ollama docker compose up # cloud provider only - Port mapping uses 5656 from .env - .env.docker updated with documented options for Ollama vs OpenRouter --- .env.docker | Bin 62 -> 990 bytes docker-compose.yml | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.env.docker b/.env.docker index bdf0ba8d87549c711ed8843cef563baa03851b61..2666942604670f220338c47eef1838f7d7a9029b 100644 GIT binary patch literal 990 zcmd6lPiw+37{>4Y6fd}g8*7XB=OFY@wJ@2krOtz=5^S`YZ4%P7L&m@l;V1NyEHQHm z+d*~`atLpq=i&FfO#=@5-HjZp0Rdg-q|9I@w>gF(qcs*13pnidFk;J%x~k!dtSf;e zVN_Xe1YTiS4TUpgd9P4KZ5OTc~@cR(vIVun|bGAhJBdk=; z{Z*?{VR1$K0I6BGLguW*VB05PW}+*ufeqTgp9RT0o_Lv*yzjb3(r>jo?T%Zw&O$#L zC(pscGXg!IO#G>zOv6zy@s7dmv)WAWJ}yO{zv~WEU5;tYD*aTN%bZoIsSJ`}analQ zi?`Ik$}f(72N4%>qN%^dC+2cvGhx>)dlAlK-6DAk;^3q*tmhn8ul#~FVnRZJI45*{ V)sOh!ySDr&N}@1+^}4-o?+f*W%Xt6* literal 62 zcmezW&!52u2pt)GfjAyW`ZKsNxB^9N8FGLyks%j|jT!V9j2NuI{1S##hGK>i23`g( F1^}7A3poG) diff --git a/docker-compose.yml b/docker-compose.yml index 002b663..ba6f230 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,8 @@ services: ollama: image: ollama/ollama:latest + profiles: + - ollama container_name: english-styler-ollama ports: - "11434:11434" @@ -16,6 +18,8 @@ services: model-init: image: ollama/ollama:latest + profiles: + - ollama container_name: english-styler-model-init depends_on: ollama: @@ -34,15 +38,15 @@ services: build: . container_name: english-styler-app ports: - - "5656:3000" - depends_on: - model-init: - condition: service_completed_successfully + - "${APP_PORT:-5656}:3000" + env_file: + - path: .env + required: false environment: - OPENAI_BASE_URL: http://ollama:11434/v1 - OPENAI_API_KEY: ollama - OPENAI_MODEL: ${OLLAMA_MODEL:-llama3} + OPENAI_BASE_URL: ${OPENAI_BASE_URL:-http://ollama:11434/v1} + OPENAI_API_KEY: ${OPENAI_API_KEY:-ollama} + OPENAI_MODEL: ${OPENAI_MODEL:-llama3} restart: unless-stopped volumes: - ollama-data: + ollama-data: \ No newline at end of file