Refactor Dockerfile to streamline user creation, add FastAPI startup script, and enhance directory structure for Ollama integration

Dockerfile.fastapi

@@ -7,8 +7,11 @@ RUN apt-get update && apt-get install -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Install Ollama
+RUN curl -fsSL https://ollama.com/install.sh | sh
+
 # Create non-root user for security
-RUN groupadd -r appuser && useradd -r -g appuser appuser
+RUN groupadd -r appuser && useradd -r -g appuser -m appuser
 
 # Set working directory
 WORKDIR /app
@@ -18,14 +21,19 @@ COPY requirements.txt .
 RUN pip3 install --no-cache-dir --upgrade pip && \
     pip3 install --no-cache-dir -r requirements.txt
 
-# Copy FastAPI application
+# Copy FastAPI application and startup script
 COPY fast.py .
+COPY fastapi_startup_script.sh .
+RUN chmod +x fastapi_startup_script.sh
 
-# Create logs directory
-RUN mkdir -p /app/logs
+# Create logs directory and Ollama directories
+RUN mkdir -p /app/logs && \
+    mkdir -p /home/appuser/.ollama && \
+    mkdir -p /home/appuser/.ollama/models
 
 # Change ownership to non-root user
-RUN chown -R appuser:appuser /app
+RUN chown -R appuser:appuser /app && \
+    chown -R appuser:appuser /home/appuser/.ollama
 
 # Switch to non-root user
 USER appuser
@@ -37,5 +45,5 @@ EXPOSE 7860
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:7860/health || exit 1
 
-# Start FastAPI
-CMD ["python3", "-m", "uvicorn", "fast:app", "--host", "0.0.0.0", "--port", "7860"]
+# Start Ollama and FastAPI
+CMD ["./fastapi_startup_script.sh"]