Jannik Streidl преди 1 година
родител
ревизия
6dc4b748fb
променени са 3 файла, в които са добавени 5 реда и са изтрити 0 реда
  1. 1 0
      Dockerfile
  2. 2 0
      backend/config.py
  3. 2 0
      backend/start.sh

+ 1 - 0
Dockerfile

@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
 # syntax=docker/dockerfile:1
 # Initialize device type args
 # Initialize device type args
+# use buiild args in the docker build commmand with --build-arg="BUILDARG=true"
 ARG USE_CUDA=false
 ARG USE_CUDA=false
 ARG USE_MPS=false
 ARG USE_MPS=false
 ARG INCLUDE_OLLAMA=false
 ARG INCLUDE_OLLAMA=false

+ 2 - 0
backend/config.py

@@ -221,6 +221,8 @@ if OLLAMA_BASE_URL == "" and OLLAMA_API_BASE_URL != "":
 if ENV == "prod":
 if ENV == "prod":
     if OLLAMA_BASE_URL == "/ollama":
     if OLLAMA_BASE_URL == "/ollama":
         if INCLUDE_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"
             OLLAMA_BASE_URL = "http://localhost:11434"
         else:    
         else:    
             OLLAMA_BASE_URL = "http://host.docker.internal:11434"
             OLLAMA_BASE_URL = "http://host.docker.internal:11434"

+ 2 - 0
backend/start.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 #!/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}
 INCLUDE_OLLAMA=${INCLUDE_OLLAMA_ENV:-false}
 
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )