Update startup.sh

startup.sh

@@ -1,56 +1,50 @@
-# 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"]
+#!/bin/bash
+
+# Exit on any error
+set -e
+
+echo "Starting Ollama and FastAPI application..."
+
+# Create necessary directories
+mkdir -p /tmp/ollama/models
+export OLLAMA_MODELS=/tmp/ollama/models
+export OLLAMA_HOME=/tmp/ollama
+
+# Start Ollama server in the background
+echo "Starting Ollama server..."
+ollama serve &
+OLLAMA_PID=$!
+
+# Wait for Ollama to be ready
+echo "Waiting for Ollama server to start..."
+for i in {1..30}; do
+    if curl -s http://localhost:11434/api/tags > /dev/null 2>&1; then
+        echo "Ollama server is ready!"
+        break
+    fi
+    if [ $i -eq 30 ]; then
+        echo "Timeout waiting for Ollama server to start"
+        exit 1
+    fi
+    sleep 2
+done
+
+# Optional: Pull a model (uncomment and modify as needed)
+# echo "Pulling llama2 model..."
+# ollama pull llama2
+
+# Start FastAPI application
+echo "Starting FastAPI application..."
+python app.py
+
+# Keep the script running and handle cleanup
+cleanup() {
+    echo "Shutting down..."
+    kill $OLLAMA_PID 2>/dev/null || true
+    exit 0
+}
+
+trap cleanup SIGTERM SIGINT
+
+# Wait for background processes
+wait