diff --git a/.env.docker b/.env.docker index bdf0ba8..2666942 100644 Binary files a/.env.docker and b/.env.docker differ 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