Update Dockerfile

Dockerfile

@@ -1,64 +1,87 @@
-FROM python:3.10-slim
+# Use an official Python runtime as a parent image
+FROM python:3.10-slim-bullseye
 
-ENV PYTHONUNBUFFERED=1
+# Set environment variables
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PIP_NO_CACHE_DIR off
+ENV PIP_DISABLE_PIP_VERSION_CHECK 1
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        ffmpeg \
-        libsm6 \
-        libxext6 \
-        fontconfig \
-        imagemagick \
-        ghostscript && \
-    ( \
-        POLICY_FILE=$(find /etc/ImageMagick* -name policy.xml -print -quit 2>/dev/null) && \
-        if [ -n "$POLICY_FILE" ] && [ -f "$POLICY_FILE" ]; then \
-            echo "INFO: Modifying ImageMagick policy file: $POLICY_FILE"; \
-            sed -i 's/<policy domain="coder" rights="none" pattern="PS" \/>/<!-- & -->/' "$POLICY_FILE" && \
-            sed -i 's/<policy domain="coder" rights="none" pattern="EPS" \/>/<!-- & -->/' "$POLICY_FILE" && \
-            sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<!-- & -->/' "$POLICY_FILE" && \
-            sed -i 's/<policy domain="coder" rights="none" pattern="TEXT" \/>/<!-- & -->/' "$POLICY_FILE" && \
-            sed -i 's/<policy domain="coder" rights="none" pattern="LABEL" \/>/<!-- & -->/' "$POLICY_FILE" && \
-            sed -i 's/<policy domain="path" rights="none" pattern="@*" \/>/<!-- & -->/' "$POLICY_FILE" && \
-            echo "INFO: ImageMagick policy potentially updated."; \
-        else \
-            echo "WARNING: ImageMagick policy.xml not found. TextClip might fail."; \
-        fi \
-    ) && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+# Set the working directory in the container
+WORKDIR /app
 
-RUN mkdir -p /usr/local/share/fonts/truetype/mycustomfonts
-COPY assets/fonts/arial.ttf /usr/local/share/fonts/truetype/mycustomfonts/arial.ttf 
+# Install system dependencies
+# - ffmpeg for MoviePy audio/video processing
+# - imagemagick for MoviePy TextClip and other image operations
+# - git in case requirements.txt pulls from git repositories
+# - fonts-dejavu-core and fonts-liberation for general font availability
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ffmpeg \
+    imagemagick \
+    git \
+    fonts-dejavu-core \
+    fonts-liberation \
+    # Add any other system-level packages your app might need (e.g., build-essential if compiling C extensions)
+    && rm -rf /var/lib/apt/lists/*
 
-RUN fc-cache -f -s -v
+# Modify ImageMagick policy.xml to allow operations needed by MoviePy
+# This is critical for TextClip and other ImageMagick-dependent features in MoviePy
+# It attempts to find policy.xml for ImageMagick v6 or v7 and comments out restrictive lines.
+RUN if [ -f /etc/ImageMagick-6/policy.xml ]; then \
+        XML_FILE="/etc/ImageMagick-6/policy.xml"; \
+        echo "INFO: Modifying ImageMagick policy at $XML_FILE (v6) for MoviePy compatibility." ; \
+    elif [ -f /etc/ImageMagick-7/policy.xml ]; then \
+        XML_FILE="/etc/ImageMagick-7/policy.xml"; \
+        echo "INFO: Modifying ImageMagick policy at $XML_FILE (v7) for MoviePy compatibility." ; \
+    else \
+        XML_FILE=""; \
+        echo "WARNING: ImageMagick policy.xml not found in expected /etc/ImageMagick-[67]/ locations. MoviePy TextClip might fail." ; \
+    fi && \
+    if [ -n "$XML_FILE" ] && [ -f "$XML_FILE" ]; then \
+        sed -i 's/<policy domain="path" rights="none" pattern="@\*"\/>/<!-- <policy domain="path" rights="none" pattern="@\*" \/> -->/' "$XML_FILE" && \
+        sed -i 's/<policy domain="coder" rights="none" pattern="TEXT"\/>/<!-- <policy domain="coder" rights="none" pattern="TEXT" \/> -->/' "$XML_FILE" && \
+        sed -i 's/<policy domain="coder" rights="none" pattern="LABEL"\/>/<!-- <policy domain="coder" rights="none" pattern="LABEL" \/> -->/' "$XML_FILE" && \
+        sed -i 's/<policy domain="coder" rights="none" pattern="MVG"\/>/<!-- <policy domain="coder" rights="none" pattern="MVG" \/> -->/' "$XML_FILE" && \
+        sed -i 's/<policy domain="coder" rights="none" pattern="MSL"\/>/<!-- <policy domain="coder" rights="none" pattern="MSL" \/> -->/' "$XML_FILE" && \
+        sed -i 's/<policy domain="coder" rights="none" pattern="HTTPS"\/>/<!-- <policy domain="coder" rights="none" pattern="HTTPS" \/> -->/' "$XML_FILE" && \
+        sed -i 's/<policy domain="coder" rights="none" pattern="HTTP"\/>/<!-- <policy domain="coder" rights="none" pattern="HTTP" \/> -->/' "$XML_FILE" && \
+        echo "INFO: ImageMagick policy modifications attempted." ; \
+    fi
 
-ARG APP_USER_UID=1000
-ARG APP_USER_GID=1000
-RUN groupadd --gid $APP_USER_GID appgroup && \
-    useradd --uid $APP_USER_UID --gid appgroup --shell /bin/bash --create-home appuser
+# Copy the requirements file first to leverage Docker cache
+COPY requirements.txt .
 
-# Set WORKDIR for appuser's home/app space
-WORKDIR /home/appuser/app 
+# Install Python dependencies
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt
 
-# Copy requirements first (as root or default builder user)
-COPY requirements.txt ./
-RUN python -m pip install --no-cache-dir --upgrade pip && \
-    python -m pip install --no-cache-dir -r requirements.txt
-
-# Copy all application code
+# Copy the rest of the application code into the container
 COPY . .
 
-# Ensure the output directory exists and is writable by appuser BEFORE switching user
-RUN mkdir -p /home/appuser/app/temp_cinegen_media && \
-    chown -R appuser:appgroup /home/appuser/app/temp_cinegen_media && \
-    chown -R appuser:appgroup /home/appuser/app 
+# Create a directory for fonts if it doesn't exist and copy custom fonts
+# This assumes your 'arial.ttf' (or other custom fonts) are in 'assets/fonts/' in your project
+# Adjust the source path ('assets/fonts/arial.ttf') if your font is located elsewhere.
+RUN mkdir -p /usr/local/share/fonts/truetype/mycustomfonts && \
+    if [ -f assets/fonts/arial.ttf ]; then \
+        cp assets/fonts/arial.ttf /usr/local/share/fonts/truetype/mycustomfonts/arial.ttf && \
+        echo "INFO: Copied arial.ttf to custom font directory." ; \
+    else \
+        echo "WARNING: assets/fonts/arial.ttf not found. Ensure fonts are available for Pillow/MoviePy." ; \
+    fi && \
+    fc-cache -fv  # Update the system font cache
 
-# Switch to the non-root user
-USER appuser
-# Ensure user's local bin is in PATH for pip-installed executables
-ENV PATH="/home/appuser/.local/bin:${PATH}" 
+# Create the output directory for media and ensure it's writable
+# The Hugging Face Spaces environment usually runs as 'appuser' (UID 1000)
+RUN mkdir -p /app/temp_cinegen_media && chown -R 1000:1000 /app/temp_cinegen_media
+# If running locally as root, this chown might not be strictly necessary,
+# but it's good practice for environments that use a non-root user.
 
+# Expose the port Streamlit runs on
 EXPOSE 8501
-CMD ["streamlit", "run", "app.py", "--server.headless=true", "--server.port=8501", "--server.fileWatcherType=none"]
+
+# Define the command to run the application
+# Use 0.0.0.0 to make the app accessible from outside the container
+# The Hugging Face Spaces environment might override this CMD or provide its own startup script.
+# For local Docker runs, this will be used.
+CMD ["streamlit", "run", "app.py", "--server.port=8501", "--server.address=0.0.0.0"]