From 437ad2a0dfd3d52a310c9bcff211eabe6ed1b799 Mon Sep 17 00:00:00 2001
From: Sam Cheng <samchenghowing@gmail.com>
Date: Mon, 12 Aug 2024 17:14:32 +0800
Subject: [PATCH] Fix https://github.com/docker/genai-stack/issues/175

---
 .env                          |  2 +-
 backend/pull_model.Dockerfile |  2 +-
 docker-compose.yml            | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.env b/.env
index e8989f3..b0ea9e0 100644
--- a/.env
+++ b/.env
@@ -31,7 +31,7 @@ MONGODB_URI=mongodb://mongo:27017
 #*****************************************************************
 # Ollama
 #*****************************************************************
-# OLLAMA_BASE_URL=http://llm-gpu:11434
+OLLAMA_BASE_URL=http://llm:11434
 
 #*****************************************************************
 # OpenAI
diff --git a/backend/pull_model.Dockerfile b/backend/pull_model.Dockerfile
index 4c8a9e3..e59398f 100644
--- a/backend/pull_model.Dockerfile
+++ b/backend/pull_model.Dockerfile
@@ -26,7 +26,7 @@ COPY <<EOF pull_model.clj
         (async/go-loop [n 0]
           (let [[v _] (async/alts! [done (async/timeout 5000)])]
             (if (= :stop v) :stopped (do (println (format "... pulling model (%ss) - will take several minutes" (* n 10))) (recur (inc n))))))
-        (process/shell {:env {"OLLAMA_HOST" url} :out :inherit :err :inherit} (format "bash -c './bin/ollama show %s --modelfile > /dev/null || ./bin/ollama pull %s'" llm llm))
+        (process/shell {:env {"OLLAMA_HOST" url "HOME" (System/getProperty "user.home")} :out :inherit :err :inherit} (format "bash -c './bin/ollama show %s --modelfile > /dev/null || ./bin/ollama pull %s'" llm llm))
         (async/>!! done :stop))
 
       (println "OLLAMA model only pulled if both LLM and OLLAMA_BASE_URL are set and the LLM model is not gpt")))
diff --git a/docker-compose.yml b/docker-compose.yml
index bfc499a..9a535e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,16 +17,16 @@ services:
               count: all
               capabilities: [ gpu ]
 
-  # pull-model:
-  #   build:
-  #     context: backend
-  #     dockerfile: pull_model.Dockerfile
-  #   environment:
-  #     - OLLAMA_BASE_URL=${OLLAMA_BASE_URL-http://host.docker.internal:11434}
-  #     - LLM=${LLM-llama2}
-  #   networks:
-  #     - net
-  #   tty: true
+  pull-model:
+    build:
+      context: backend
+      dockerfile: pull_model.Dockerfile
+    environment:
+      - OLLAMA_BASE_URL=${OLLAMA_BASE_URL-http://host.docker.internal:11434}
+      - LLM=${LLM-llama2}
+    networks:
+      - net
+    tty: true
 
   neo4j-database:
     user: neo4j:neo4j
@@ -97,8 +97,8 @@ services:
     depends_on:
       neo4j-database:
         condition: service_healthy
-      # pull-model:
-      #   condition: service_completed_successfully
+      pull-model:
+        condition: service_completed_successfully
     develop:
       watch:
         - action: rebuild