Refactor Dockerfile: improve comments for clarity, streamline installation steps, and enhance user permissions setup

Dockerfile

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