Update Dockerfile

Dockerfile

@@ -1,13 +1,76 @@
-FROM python:3.9
+FROM python:3.11-slim
 
-RUN useradd -m -u 1000 user
-USER user
-ENV PATH="/home/user/.local/bin:$PATH"
+# Set environment variables
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    ENV_MODE="production" \
+    PYTHONPATH=/app \
+    REDIS_URL="redis://localhost:6379/0"
 
 WORKDIR /app
 
-COPY --chown=user ./requirements.txt requirements.txt
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
+# Install system dependencies including Redis
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    curl \
+    redis-server \
+    && rm -rf /var/lib/apt/lists/*
 
-COPY --chown=user . /app
-CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]
+# Configure Redis
+RUN sed -i 's/bind 127.0.0.1 ::1/bind 0.0.0.0/' /etc/redis/redis.conf && \
+    sed -i 's/protected-mode yes/protected-mode no/' /etc/redis/redis.conf && \
+    sed -i 's/daemonize yes/daemonize no/' /etc/redis/redis.conf
+
+# Create non-root user and set up directories
+RUN useradd -m -u 1000 appuser && \
+    mkdir -p /app/logs && \
+    chown -R appuser:appuser /app && \
+    chown -R appuser:appuser /var/lib/redis && \
+    chown -R appuser:appuser /var/log/redis && \
+    chown -R appuser:appuser /etc/redis
+
+# Install Python dependencies
+COPY --chown=appuser:appuser requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt gunicorn
+
+# Switch to non-root user
+USER appuser
+
+# Copy application code
+COPY --chown=appuser:appuser . .
+
+# Expose the port the app runs on
+EXPOSE 7860 6379
+
+# Calculate optimal worker count based on 16 vCPUs
+# Using (2*CPU)+1 formula for CPU-bound applications
+ENV WORKERS=33
+ENV THREADS=2
+ENV WORKER_CONNECTIONS=2000
+
+# Create a startup script to run both Redis and Gunicorn
+RUN echo '#!/bin/sh\n\
+redis-server /etc/redis/redis.conf &\n\
+gunicorn api:app \
+     --workers $WORKERS \
+     --worker-class uvicorn.workers.UvicornWorker \
+     --bind 0.0.0.0:7860 \
+     --timeout 600 \
+     --graceful-timeout 300 \
+     --keep-alive 250 \
+     --max-requests 2000 \
+     --max-requests-jitter 400 \
+     --forwarded-allow-ips '*' \
+     --worker-connections $WORKER_CONNECTIONS \
+     --worker-tmp-dir /dev/shm \
+     --preload \
+     --log-level info \
+     --access-logfile - \
+     --error-logfile - \
+     --capture-output \
+     --enable-stdio-inheritance \
+     --threads $THREADS\n\
+wait' > /app/start.sh && chmod +x /app/start.sh
+
+# Run the startup script
+CMD ["/app/start.sh"]