Update entrypoint.sh

entrypoint.sh

@@ -1,59 +1,76 @@
-#!/bin/sh
-echo "===== Entrypoint: Starting at $(date) ====="
-echo "Entrypoint: Current user: $(id)"
-echo "Entrypoint: Verifying directories exist"
-mkdir -p /app /model /tmp/Ultralytics /snapshots || { echo "Error: Failed to create directories"; exit 1; }
-chown appuser:appuser /app /model /tmp/Ultralytics /snapshots || { echo "Error: Failed to chown directories"; exit 1; }
-chmod 777 /app /model /tmp/Ultralytics /snapshots || { echo "Error: Failed to chmod directories"; exit 1; }
-echo "Entrypoint: Directory permissions:"
-ls -ld /app /model /tmp/Ultralytics /snapshots
-
-echo "Entrypoint: Copying yolov8n.pt to /app"
-if [ -f /model/yolov8n.pt ]; then
-    cp /model/yolov8n.pt /app/yolov8n.pt || { echo "Error: Failed to copy yolov8n.pt"; exit 1; }
-    chown appuser:appuser /app/yolov8n.pt
-    chmod 644 /app/yolov8n.pt
-else
-    echo "Error: /model/yolov8n.pt not found. Build may have failed."
-    exit 1
-fi
-
-echo "Entrypoint: Copying app.py to /app (in case Hugging Face mount overwrites it)"
-if [ -f /source/app.py ]; then
-    cp /source/app.py /app/app.py || { echo "Error: Failed to copy app.py"; exit 1; }
-    chown appuser:appuser /app/app.py
-    chmod 644 /app/app.py
-else
-    echo "Error: /source/app.py not found. Build may have failed."
-    exit 1
-fi
-
-echo "Entrypoint: Setting working directory to /app"
-cd /app || { echo "Error: Failed to change directory to /app"; exit 1; }
-
-echo "Entrypoint: Current working directory: $(pwd)"
-echo "Entrypoint: Contents of /app:"
-ls -l /app || echo "Error: Failed to list /app contents"
-
-echo "Entrypoint: Verifying yolov8n.pt exists in /app"
-if [ ! -f /app/yolov8n.pt ]; then
-    echo "Error: yolov8n.pt not found in /app after copy. Directory contents:"
-    ls -l /app
-    exit 1
-fi
-
-echo "Entrypoint: Verifying app.py exists in /app"
-if [ ! -f /app/app.py ]; then
-    echo "Error: app.py not found in /app after copy. Directory contents:"
-    ls -l /app
-    exit 1
-fi
-
-echo "Entrypoint: Contents of /home/user/app (Hugging Face mount point):"
-ls -l /home/user/app || echo "Directory /home/user/app does not exist"
-
-echo "Entrypoint: Contents of /source (persistent storage):"
-ls -l /source || echo "Directory /source does not exist"
-
-echo "Entrypoint: Launching application"
-exec python /app/app.py
+# Use Python 3.10-slim as base image
+FROM python:3.10-slim
+
+# Install system dependencies for OpenCV, FFmpeg, and debugging
+RUN apt-get update && apt-get install -y \
+    libgl1-mesa-glx \
+    libglib2.0-0 \
+    ffmpeg \
+    curl \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user and set up directories with proper permissions
+RUN useradd -m -u 1000 appuser && \
+    mkdir -p /tmp/Ultralytics /snapshots /app /model /source && \
+    chown -R appuser:appuser /tmp/Ultralytics /snapshots /app /model /source && \
+    chmod -R 777 /tmp/Ultralytics /snapshots /app /model /source && \
+    ls -ld /app/ && \
+    ls -ld /model/ && \
+    ls -ld /source/
+
+# Remove appuser's home directory to prevent interference
+RUN rm -rf /home/appuser && \
+    ln -s /app /home/appuser
+
+# Set environment variables early
+ENV YOLO_CONFIG_DIR=/tmp/Ultralytics
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONPATH=/app
+
+# Set working directory
+WORKDIR /app
+
+# Verify working directory exists
+RUN ls -ld /app/ || (echo "Error: /app/ directory not found after WORKDIR" && exit 1)
+
+# Download YOLOv8n model weights to /model/ and copy to /source/
+RUN wget https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt -O /model/yolov8n.pt && \
+    test -f /model/yolov8n.pt || (echo "Error: Failed to download yolov8n.pt." && exit 1) && \
+    cp /model/yolov8n.pt /source/yolov8n.pt && \
+    chmod 644 /model/yolov8n.pt /source/yolov8n.pt && \
+    chown appuser:appuser /model/yolov8n.pt /source/yolov8n.pt && \
+    ls -l /model/yolov8n.pt && \
+    ls -l /source/yolov8n.pt
+
+# Install Python dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code to /source/ for persistence
+COPY app.py /source/app.py
+RUN chmod 644 /source/app.py && \
+    chown appuser:appuser /source/app.py
+
+# Copy application code to /app/ (may be overwritten by Hugging Face mount)
+COPY . .
+
+# Verify /app/ contents before switching user
+RUN ls -ld /app/ || (echo "Error: /app/ directory missing before switching user" && exit 1) && \
+    ls -l /app/ || (echo "Error: Failed to list contents of /app/" && exit 1)
+
+# Switch to non-root user
+USER appuser
+
+# Verify /app/ exists and is accessible by appuser
+RUN ls -ld /app/ || (echo "Error: /app/ directory missing for appuser" && exit 1) && \
+    ls -l /app/ || (echo "Error: Failed to list contents of /app/ as appuser" && exit 1)
+
+# Copy and set up entrypoint
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Use entrypoint to ensure working directory and run the app
+# Also set CMD as a fallback in case ENTRYPOINT is overridden
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/entrypoint.sh"]