Merge branch 'master'

.gitignore

@@ -1 +1,19 @@
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
 venv/
+
+# Environment variables
+.env
+.env.*
+
+# Generated content
+static/watermarked_images/*
+static/thumbnails/*
+!static/watermarked_images/.gitkeep
+!static/thumbnails/.gitkeep
+
+# System files
+.DS_Store
+Thumbs.db

Dockerfile

@@ -10,12 +10,18 @@ COPY . /app
 # Install the dependencies
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Set environment variables to avoid potential issues with Flask and Gunicorn
+# Set environment variables
 ENV FLASK_APP=app.py
 ENV FLASK_RUN_HOST=0.0.0.0
+ENV PORT=7860
+
+# Install system fonts
+RUN apt-get update && apt-get install -y \
+    fonts-liberation \
+    && rm -rf /var/lib/apt/lists/*
 
 # Expose the port the app runs on
-EXPOSE 5000
+EXPOSE 7860
 
 # Define the command to run your app using Gunicorn
-CMD ["gunicorn", "--bind", "0.0.0.0:5000", "app:app"]
+CMD ["sh", "-c", "gunicorn app:app --bind 0.0.0.0:$PORT"]

app.py

@@ -5,7 +5,12 @@ import os
 import zipfile
 import base64
 
+# Enable detailed logging for debugging
+import logging
+logging.basicConfig(level=logging.DEBUG)
+
 app = Flask(__name__)
+app.config['DEBUG'] = True  # This enables debug mode for Flask
 
 # Configure upload folders with absolute paths
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))

requirements.txt

@@ -1,5 +1,5 @@
 Flask==2.2.0
-Pillow
+Pillow==10.0.0
 python-dotenv
 gunicorn
 Werkzeug==2.2.3