extonlawrence commited on
Commit
2e04298
·
1 Parent(s): 01fa316

Remove Ollama startup

Browse files
Files changed (2) hide show
  1. Dockerfile +2 -7
  2. entrypoint.sh +0 -36
Dockerfile CHANGED
@@ -21,19 +21,14 @@ RUN touch /app/.env.local
21
 
22
  USER root
23
  RUN apt-get update
24
- RUN apt-get install -y libgomp1 libcurl4 curl
25
-
26
- # Install Ollama
27
- RUN curl -fsSL https://ollama.ai/install.sh | sh
28
-
29
- # ensure ollama cache dir exists before adjusting ownership
30
- RUN mkdir -p /home/user/.ollama && chown -R 1000:1000 /home/user/.ollama
31
 
32
  # ensure npm cache dir exists before adjusting ownership
33
  RUN mkdir -p /home/user/.npm && chown -R 1000:1000 /home/user/.npm
34
 
35
  USER user
36
 
 
37
  COPY --chown=1000 .env /app/.env
38
  COPY --chown=1000 entrypoint.sh /app/entrypoint.sh
39
  COPY --chown=1000 package.json /app/package.json
 
21
 
22
  USER root
23
  RUN apt-get update
24
+ RUN apt-get install -y libgomp1 libcurl4
 
 
 
 
 
 
25
 
26
  # ensure npm cache dir exists before adjusting ownership
27
  RUN mkdir -p /home/user/.npm && chown -R 1000:1000 /home/user/.npm
28
 
29
  USER user
30
 
31
+
32
  COPY --chown=1000 .env /app/.env
33
  COPY --chown=1000 entrypoint.sh /app/entrypoint.sh
34
  COPY --chown=1000 package.json /app/package.json
entrypoint.sh CHANGED
@@ -14,42 +14,6 @@ if [ "$INCLUDE_DB" = "true" ] ; then
14
  nohup mongod &
15
  fi;
16
 
17
- # Start Ollama service for HF space (local gpu)
18
- echo "Starting local Ollama service"
19
-
20
- # Ensure dir for persistent model storage
21
- mkdir -p /data/models
22
-
23
- nohup env OLLAMA_MODELS=/data/models ollama serve > /tmp/ollama.log 2>&1 &
24
- OLLAMA_PID=$!
25
-
26
- # Wait for Ollama to be ready
27
- MAX_RETRIES=30
28
- RETRY_COUNT=0
29
- until curl -s http://localhost:11434/api/tags > /dev/null 2>&1; do
30
- RETRY_COUNT=$((RETRY_COUNT + 1))
31
- if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then
32
- echo "Ollama failed to start after $MAX_RETRIES attempts"
33
- cat /tmp/ollama.log
34
- exit 1
35
- fi
36
- sleep 2
37
- done
38
-
39
- # Pull models
40
- OLLAMA_MODELS=${OLLAMA_MODELS:-llama3.1:8b}
41
- IFS=',' read -ra MODEL_ARRAY <<< "$OLLAMA_MODELS"
42
- for MODEL in "${MODEL_ARRAY[@]}"; do
43
- MODEL=$(echo "$MODEL" | xargs)
44
- if ! env OLLAMA_MODELS=/data/models ollama list | grep -q "$MODEL"; then
45
- echo " Pulling model: $MODEL (this may take several minutes)..."
46
- env OLLAMA_MODELS=/data/models ollama pull "$MODEL"
47
- echo " $MODEL pulled successfully!"
48
- else
49
- echo " $MODEL already exists"
50
- fi
51
- done
52
-
53
  export PUBLIC_VERSION=$(node -p "require('./package.json').version")
54
 
55
  dotenv -e /app/.env -c -- node /app/build/index.js -- --host 0.0.0.0 --port 3000
 
14
  nohup mongod &
15
  fi;
16
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
17
  export PUBLIC_VERSION=$(node -p "require('./package.json').version")
18
 
19
  dotenv -e /app/.env -c -- node /app/build/index.js -- --host 0.0.0.0 --port 3000