update

Dockerfile

@@ -6,12 +6,6 @@ WORKDIR /app
 # Copy requirements file
 COPY requirements.txt requirements.txt
 
-# Create a virtual environment
-RUN python -m venv venv
-
-# Set the PATH to use the virtual environment
-ENV PATH="/app/venv/bin:$PATH"
-
 # Update package list and install necessary packages in a single step
 RUN apt-get update && apt-get install -y \
     curl \
@@ -19,38 +13,36 @@ RUN apt-get update && apt-get install -y \
     libffi-dev \
     cmake \
     libcurl4-openssl-dev \
-    tini \
-    systemd && \
+    tini && \
     apt-get clean
 
 # Upgrade pip and install dependencies
-RUN python -m pip install --upgrade pip
-RUN pip install --no-cache-dir -r requirements.txt
+RUN python -m venv venv && \
+    . /app/venv/bin/activate && \
+    pip install --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
 
-# Install application
+# Install Ollama
 RUN curl https://ollama.ai/install.sh | sh
 
 # Create the directory and give appropriate permissions
 RUN mkdir -p /.ollama && chmod 777 /.ollama
 
-WORKDIR /.ollama
+# Ensure Ollama binary is in the PATH
+ENV PATH="/app/venv/bin:/root/.ollama/bin:$PATH"
+
+# Expose the server port
+EXPOSE 7860
+
 # Copy the entry point script
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
+
 # Set the entry point script as the default command
 ENTRYPOINT ["/entrypoint.sh"]
 
-CMD ["ollama", "serve"]
-
 # Set the model as an environment variable (this can be overridden)
-ENV model=${model}
-
-# Expose the server port
-EXPOSE 7860
-
-# Ensure Ollama binary is in the PATH
-RUN which ollama
-
+ENV model="default_model"
 
 # Copy the entire application
 COPY . .
@@ -63,4 +55,4 @@ COPY start.sh .
 RUN chmod +x start.sh
 
 # Define the command to run the application
-CMD ["python", "./run.py"]
+CMD ["./start.sh"]

entrypoint.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 
+# Source the virtual environment
+source /app/venv/bin/activate
+
 # Starting server
-echo "Starting server"
+echo "Starting Ollama server"
 ollama serve &
 sleep 1
 
@@ -11,10 +14,7 @@ for m in "${MODELS[@]}"; do
     echo "Pulling $m"
     ollama pull "$m"
     sleep 5
-    # echo "Running $m"
-    # ollama run "$m"
-    # No need to sleep here unless you want to give some delay between each pull for some reason
 done
 
 # Keep the script running to prevent the container from exiting
-#wait
+wait

start.sh

@@ -1,21 +1,7 @@
 #!/bin/bash
-# Starting server
-echo "Starting Ollama server..."
-ollama serve &
 
-# Wait for the Ollama server to be ready
-echo "Waiting for Ollama server to be ready..."
-until curl -sSf http://localhost:11434/api/status > /dev/null; do
-    echo "Waiting for Ollama server to start..."
-    sleep 2
-done
+# Source the virtual environment
+source /app/venv/bin/activate
 
-echo "Ollama server is ready."
-
-# Pull the required model
-echo "Pulling llama3 model..."
-ollama pull llama3
-
-# Start the web UI
-echo "Starting web UI..."
-python run.py
+# Run the Python application
+exec python ./run.py

startbk2.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# Starting server
+echo "Starting Ollama server..."
+ollama serve &
+
+# Wait for the Ollama server to be ready
+echo "Waiting for Ollama server to be ready..."
+until curl -sSf http://localhost:11434/api/status > /dev/null; do
+    echo "Waiting for Ollama server to start..."
+    sleep 2
+done
+
+echo "Ollama server is ready."
+
+# Pull the required model
+echo "Pulling llama3 model..."
+ollama pull llama3
+
+# Start the web UI
+echo "Starting web UI..."
+python run.py