Refactor Dockerfile: improve comments for clarity, streamline user creation, and ensure proper permissions for Ollama home directory

Dockerfile

@@ -1,6 +1,7 @@
+# Use base Ollama image that has Ollama pre-installed
 FROM ollama/ollama:0.9.2
 
-# Install Python and dependencies with security updates
+# --- System & Python dependencies ---
 RUN apt-get update && apt-get install -y \
     python3 \
     python3-pip \
@@ -9,40 +10,37 @@ RUN apt-get update && apt-get install -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Create non-root user for security
+# --- Create non-root user ---
 RUN groupadd -r appuser && useradd -r -g appuser -m appuser
 
-# Set working directory
+# --- Set up working environment ---
 WORKDIR /app
-
-# Copy requirements and install Python packages
 COPY requirements.txt .
-RUN pip3 install --no-cache-dir -r requirements.txt
 
-# Copy your FastAPI app
+RUN pip3 install --no-cache-dir --upgrade pip \
+    && pip3 install --no-cache-dir -r requirements.txt
+
+# --- Copy FastAPI code & start script ---
 COPY fast.py .
 COPY app.py .
 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
-
-# Change ownership to non-root user
-RUN chown -R appuser:appuser /app
-
-# Set environment variables
+# --- Set environment variables ---
+ENV HOME=/home/appuser
+ENV OLLAMA_HOME=/app/.ollama
 ENV OLLAMA_HOST=0.0.0.0:11434
 ENV OLLAMA_ORIGINS=*
-ENV HOME=/home/appuser
 
-# Expose ports
+# --- Create Ollama home with permissions ---
+RUN mkdir -p $OLLAMA_HOME && chown -R appuser:appuser /app
+
+# --- Expose ports for FastAPI & Ollama ---
 EXPOSE 7860
 EXPOSE 11434
 
-# Switch to non-root user
+# --- Use non-root user ---
 USER appuser
 
-# Start both Ollama and FastAPI
-ENTRYPOINT []
-CMD ["bash", "/app/start.sh"]
+# --- Start everything ---
+CMD ["bash", "/app/start.sh"]