From faec51c6c6e0209aad64a06b59b9cec7924b8c49 Mon Sep 17 00:00:00 2001
From: Zeecka <alexgarrido@protonmail.com>
Date: Wed, 31 Dec 2025 23:04:10 +0100
Subject: [PATCH] Rebase edits from main

---
 .env.example    | 15 +++++++++++++--
 compose.dev.yml |  5 ++---
 compose.yml     | 14 +++++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index b4bc151..38a8106 100644
--- a/.env.example
+++ b/.env.example
@@ -1,15 +1,26 @@
+# Application configuration
 MAX_CONTENT_LENGTH=1048576
 MAX_PENDING_TIME=600
 MAX_STORE_TIME=259200
+CLEAR_AT_RESTART=1
+SKIP_IHDR_FILL=1
+
+# Flask configuration
 FLASK_DEBUG=0
 FLASK_ENV=development
-DB_URI=postgresql://aperiuser:aperipass@postgres:5432/aperisolve
+
+# Redis configuration
 RQ_DASHBOARD_REDIS_URL=redis://redis:6379/0
+
+# Database configuration
 POSTGRES_DB=aperisolve
 POSTGRES_USER=aperiuser
 POSTGRES_PASSWORD=aperipass
+DB_URI=postgresql://aperiuser:aperipass@postgres:5432/aperisolve
+
+# Sentry configuration
 SENTRY_DSN=https://your-dsn@sentry.io/project-id
 SENTRY_TRACES_SAMPLE_RATE=0.1
 SENTRY_PROFILES_SAMPLE_RATE=0.1
 SENTRY_RELEASE=1.0.0
-ENVIRONMENT=development
\ No newline at end of file
+SENTRY_ENVIRONMENT=development
diff --git a/compose.dev.yml b/compose.dev.yml
index 0b19a14..6f46315 100644
--- a/compose.dev.yml
+++ b/compose.dev.yml
@@ -60,7 +60,6 @@ services:
     env_file:
       - .env.example
 
-
   rqdashboard:
     image: eoranged/rq-dashboard
     container_name: rq-dashboard
@@ -71,6 +70,6 @@ services:
       - redis
     env_file:
       - .env.example
-      
+
 volumes:
-  pgdata:
\ No newline at end of file
+  pgdata:
diff --git a/compose.yml b/compose.yml
index 777fef2..4489e66 100644
--- a/compose.yml
+++ b/compose.yml
@@ -17,6 +17,12 @@ services:
         condition: service_started
     env_file:
       - .env
+    healthcheck:
+      test: ["CMD-SHELL", "dd if=/dev/urandom of=/tmp/healthcheck.png bs=1 count=1000000 && curl -X POST -F 'image=@/tmp/healthcheck.png' http://localhost:5000/upload -s -o /dev/null -w '%{http_code}' | grep -q 200"]
+      interval: 3600s
+      timeout: 30s
+      retries: 3
+      start_period: 900s
 
   worker:
     image: ghcr.io/zeecka/aperisolve:latest
@@ -31,13 +37,15 @@ services:
       - postgres
     env_file:
       - .env
+    environment:
+      - CLEAR_AT_RESTART=0  # Always false for worker to prevent double clearing
 
   postgres:
-    image: postgres:14
+    image: postgres:18
     container_name: postgres
     restart: always
     volumes:
-      - pgdata:/var/lib/postgresql/data
+      - pgdata:/var/lib/postgresql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U aperiuser -d aperisolve"]
       interval: 5s
@@ -63,7 +71,7 @@ services:
       - redis
     env_file:
       - .env
-      
+
 volumes:
   apresults:
   pgdata: