Enhance Dockerfile and start script: add debug information for Ollama installation and improve error handling for server startup and model pulling

Dockerfile

@@ -35,6 +35,13 @@ ENV OLLAMA_ORIGINS=*
 # --- Create Ollama home with permissions ---
 RUN mkdir -p $OLLAMA_HOME && chown -R appuser:appuser /app
 
+# --- Debug: Check Ollama installation ---
+RUN echo "=== Ollama Installation Check ===" && \
+    which ollama || echo "ollama not in PATH" && \
+    ls -la /usr/local/bin/ollama || echo "ollama not in /usr/local/bin/" && \
+    ls -la /usr/bin/ollama || echo "ollama not in /usr/bin/" && \
+    echo "================================="
+
 # --- Expose ports for FastAPI & Ollama ---
 EXPOSE 7860
 EXPOSE 11434
@@ -43,4 +50,4 @@ EXPOSE 11434
 USER appuser
 
 # --- Start everything ---
-CMD ["bash", "/app/start.sh"]
+CMD ["/app/start.sh"]

start.sh

@@ -1,7 +1,33 @@
 #!/bin/bash
 
+# Debug information
+echo "=== Debug Information ==="
+echo "Current user: $(whoami)"
+echo "Current directory: $(pwd)"
+echo "Home directory: $HOME"
+echo "Ollama home: $OLLAMA_HOME"
+echo "PATH: $PATH"
+echo "Which ollama: $(which ollama)"
+echo "Ollama version: $(ollama --version 2>&1 || echo 'Failed to get version')"
+echo "========================="
+
 # Start Ollama server in background
-ollama serve &
+echo "Starting Ollama server..."
+
+# Try different ways to start Ollama in case of PATH issues
+if command -v ollama >/dev/null 2>&1; then
+    echo "Using ollama from PATH"
+    ollama serve &
+elif [ -f "/usr/local/bin/ollama" ]; then
+    echo "Using ollama from /usr/local/bin/"
+    /usr/local/bin/ollama serve &
+elif [ -f "/usr/bin/ollama" ]; then
+    echo "Using ollama from /usr/bin/"
+    /usr/bin/ollama serve &
+else
+    echo "ERROR: Could not find ollama binary!"
+    exit 1
+fi
 
 # Wait for Ollama to start
 echo "Waiting for Ollama server to start..."
@@ -13,7 +39,18 @@ echo "Ollama server started!"
 
 # Pull the LLaVA model for vision analysis
 echo "Pulling LLaVA model for vision analysis..."
-ollama pull llava:7b
+
+# Use the same approach for pulling models
+if command -v ollama >/dev/null 2>&1; then
+    ollama pull llava:7b
+elif [ -f "/usr/local/bin/ollama" ]; then
+    /usr/local/bin/ollama pull llava:7b
+elif [ -f "/usr/bin/ollama" ]; then
+    /usr/bin/ollama pull llava:7b
+else
+    echo "ERROR: Could not find ollama binary for pulling model!"
+    exit 1
+fi
 
 echo "Model pulled successfully!"