Update startup.sh

startup.sh

@@ -1,43 +1,56 @@
-#!/bin/bash
-
-echo "=== Starting Ollama Generate API ==="
-
-# Set HOME to /tmp to avoid permission issues with /.ollama
-export HOME=/tmp
-
-# Use /tmp to avoid any permission issues
-export OLLAMA_HOST=0.0.0.0:11434
-export OLLAMA_MODELS=/tmp/ollama/models
-export OLLAMA_HOME=/tmp/ollama
-export OLLAMA_ORIGINS="*"
-
-# Create directories
-mkdir -p /tmp/ollama/models
-mkdir -p /tmp/.ollama
-echo "✅ Created Ollama directories in /tmp"
-
-# Start Ollama server
-echo "Starting Ollama server..."
-ollama serve &
-OLLAMA_PID=$!
-
-# Wait for server to start
-echo "Waiting for Ollama server..."
-sleep 10
-
-# Check if server is running
-if curl -s http://localhost:11434/api/tags > /dev/null; then
-    echo "✅ Ollama server is running!"
-else
-    echo "❌ Ollama server failed to start"
-    kill $OLLAMA_PID 2>/dev/null || true
-    exit 1
-fi
-
-# Pull tiny model in background
-echo "Pulling TinyLlama model..."
-ollama pull tinyllama &
-
-# Start FastAPI app
-echo "Starting FastAPI application..."
-python3 app.py
+# Use Ubuntu as base image for better Ollama compatibility
+FROM ubuntu:22.04
+
+# Prevent interactive prompts during package installation
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Set working directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    curl \
+    python3 \
+    python3-pip \
+    python3-venv \
+    wget \
+    ca-certificates \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create and activate virtual environment
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Install Python dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
+
+# Install Ollama
+RUN curl -fsSL https://ollama.ai/install.sh | sh
+
+# No need to create ollama directories - will use /tmp
+
+# Copy application files
+COPY app.py .
+COPY startup.sh .
+
+# Make startup script executable
+RUN chmod +x startup.sh
+
+# Set environment variables for Ollama (using /tmp for guaranteed write access)
+ENV HOME=/tmp
+ENV OLLAMA_HOST=0.0.0.0:11434
+ENV OLLAMA_MODELS=/tmp/ollama/models
+ENV OLLAMA_HOME=/tmp/ollama
+
+# Expose ports
+EXPOSE 7860 11434
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=30s --start-period=60s --retries=3 \
+    CMD curl -f http://localhost:7860/health || exit 1
+
+# Start both Ollama server and FastAPI app
+CMD ["./startup.sh"]