Refactor Dockerfile and start script: fix user ID assignment, enhance Ollama directory setup, and improve debug information

Dockerfile

@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Create non-root user for security
-RUN groupadd -r appuser && useradd -r -g appuser -m appuser
+RUN groupadd -r appuser && useradd -r -g appuser -m -u 1000 appuser
 
 # Set working directory
 WORKDIR /app
@@ -26,7 +26,9 @@ COPY start.sh .
 RUN chmod +x start.sh
 
 # Create Ollama directory and set permissions
-RUN mkdir -p /home/appuser/.ollama && chown -R appuser:appuser /home/appuser/.ollama
+RUN mkdir -p /home/appuser/.ollama && \
+    chown -R appuser:appuser /home/appuser/.ollama && \
+    chmod -R 755 /home/appuser/.ollama
 
 # Change ownership to non-root user
 RUN chown -R appuser:appuser /app
@@ -35,6 +37,7 @@ RUN chown -R appuser:appuser /app
 ENV OLLAMA_HOST=0.0.0.0:11434
 ENV OLLAMA_ORIGINS=*
 ENV HOME=/home/appuser
+ENV OLLAMA_HOME=/home/appuser/.ollama
 
 # Expose ports
 EXPOSE 7860
@@ -44,5 +47,4 @@ EXPOSE 11434
 USER appuser
 
 # Start both Ollama and FastAPI
-ENTRYPOINT []
-CMD ["bash", "/app/start.sh"]
+CMD ["/app/start.sh"]

start.sh

@@ -3,14 +3,27 @@
 # Debug information
 echo "=== Debug Information ==="
 echo "Current user: $(whoami)"
+echo "User ID: $(id)"
 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')"
+
+# Check Ollama directory permissions
+echo "Checking Ollama directory:"
+ls -la $HOME/.ollama/ 2>/dev/null || echo "Ollama directory doesn't exist"
+echo "Checking if we can write to Ollama directory:"
+touch $HOME/.ollama/test_write 2>/dev/null && rm $HOME/.ollama/test_write && echo "Write test: SUCCESS" || echo "Write test: FAILED"
 echo "========================="
 
+# Ensure Ollama directory exists and has correct permissions
+echo "Setting up Ollama directory..."
+mkdir -p $HOME/.ollama
+chmod 755 $HOME/.ollama
+echo "Ollama directory setup complete."
+
 # Start Ollama server in background
 echo "Starting Ollama server..."