diff --git a/Dockerfile b/Dockerfile index 4a6baa0a2..65e4ce835 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 # Initialize device type args +# use buiild args in the docker build commmand with --build-arg="BUILDARG=true" ARG USE_CUDA=false ARG USE_MPS=false ARG INCLUDE_OLLAMA=false diff --git a/backend/config.py b/backend/config.py index 1a36c3242..5ae0eaaae 100644 --- a/backend/config.py +++ b/backend/config.py @@ -221,6 +221,8 @@ if OLLAMA_BASE_URL == "" and OLLAMA_API_BASE_URL != "": if ENV == "prod": if OLLAMA_BASE_URL == "/ollama": if INCLUDE_OLLAMA: + # If you use all in one Docker container (WEbUI + Ollama) + # with the docker build arg INCLUDE_OLLAMA=true (--build-arg="INCLUDE_OLLAMA=true") this only works with http://localhost:11434 OLLAMA_BASE_URL = "http://localhost:11434" else: OLLAMA_BASE_URL = "http://host.docker.internal:11434" diff --git a/backend/start.sh b/backend/start.sh index fe14444db..510a7f999 100755 --- a/backend/start.sh +++ b/backend/start.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# Get the INCLUDE_OLLAMA_ENV environment variable whcih is set in the Dockerfile +# This includes the ollama in the image INCLUDE_OLLAMA=${INCLUDE_OLLAMA_ENV:-false} SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )