From cac572dec9d030e6f4caf36d2dca75f39742df39 Mon Sep 17 00:00:00 2001
From: Zeecka <alexgarrido@protonmail.com>
Date: Wed, 31 Dec 2025 23:16:31 +0100
Subject: [PATCH] fix conflict compose dev

---
 compose.dev.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/compose.dev.yml b/compose.dev.yml
index 134bea6..6f46315 100644
--- a/compose.dev.yml
+++ b/compose.dev.yml
@@ -4,7 +4,7 @@ services:
     build: .
     container_name: aperisolve-web
     restart: always
-    command: ["/bin/sh", "-c", "flask --app aperisolve.app run --host=0.0.0.0 --port=5000"]
+    command: ["flask", "--app", "aperisolve.app", "run", "--host=0.0.0.0", "--port=5000"]
     ports:
       - "5000:5000"
     volumes:
@@ -17,50 +17,48 @@ services:
       worker:
         condition: service_started
     env_file:
-      - .env
+      - .env.example
     environment:
       - FLASK_DEBUG=true
       - FLASK_ENV=development
-      - SKIP_IHDR_FILL=1
 
   worker:
     #image: ghcr.io/zeecka/aperisolve:latest
     build: .
     container_name: aperisolve-worker
     restart: always
-    command: ["/bin/sh", "-c", "rq worker default --url redis://redis:6379/0"]
+    command: rq worker default --url redis://redis:6379/0
     volumes:
       - ./aperisolve:/aperisolve
     depends_on:
       - redis
       - postgres
     env_file:
-      - .env
+      - .env.example
     environment:
       - FLASK_DEBUG=true
       - FLASK_ENV=development
-      - CLEAR_AT_RESTART=0  # Always false for worker to prevent double clearing
 
   redis:
-    image: redis:8
+    image: redis:7
     container_name: redis
     restart: always
     env_file:
-      - .env
+      - .env.example
 
   postgres:
-    image: postgres:18
+    image: postgres:14
     container_name: postgres
     restart: always
     volumes:
-      - pgdata:/var/lib/postgresql
+      - pgdata:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U aperiuser -d aperisolve"]
       interval: 5s
       timeout: 5s
       retries: 5
     env_file:
-      - .env
+      - .env.example
 
   rqdashboard:
     image: eoranged/rq-dashboard
@@ -71,8 +69,7 @@ services:
     depends_on:
       - redis
     env_file:
-      - .env
+      - .env.example
 
 volumes:
-  apresults:
   pgdata: