fix conflict compose dev

This commit is contained in:
Zeecka
2025-12-31 23:16:31 +01:00
parent 6f2c412864
commit cac572dec9
+10 -13
View File
@@ -4,7 +4,7 @@ services:
build: . build: .
container_name: aperisolve-web container_name: aperisolve-web
restart: always 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: ports:
- "5000:5000" - "5000:5000"
volumes: volumes:
@@ -17,50 +17,48 @@ services:
worker: worker:
condition: service_started condition: service_started
env_file: env_file:
- .env - .env.example
environment: environment:
- FLASK_DEBUG=true - FLASK_DEBUG=true
- FLASK_ENV=development - FLASK_ENV=development
- SKIP_IHDR_FILL=1
worker: worker:
#image: ghcr.io/zeecka/aperisolve:latest #image: ghcr.io/zeecka/aperisolve:latest
build: . build: .
container_name: aperisolve-worker container_name: aperisolve-worker
restart: always restart: always
command: ["/bin/sh", "-c", "rq worker default --url redis://redis:6379/0"] command: rq worker default --url redis://redis:6379/0
volumes: volumes:
- ./aperisolve:/aperisolve - ./aperisolve:/aperisolve
depends_on: depends_on:
- redis - redis
- postgres - postgres
env_file: env_file:
- .env - .env.example
environment: environment:
- FLASK_DEBUG=true - FLASK_DEBUG=true
- FLASK_ENV=development - FLASK_ENV=development
- CLEAR_AT_RESTART=0 # Always false for worker to prevent double clearing
redis: redis:
image: redis:8 image: redis:7
container_name: redis container_name: redis
restart: always restart: always
env_file: env_file:
- .env - .env.example
postgres: postgres:
image: postgres:18 image: postgres:14
container_name: postgres container_name: postgres
restart: always restart: always
volumes: volumes:
- pgdata:/var/lib/postgresql - pgdata:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U aperiuser -d aperisolve"] test: ["CMD-SHELL", "pg_isready -U aperiuser -d aperisolve"]
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 5 retries: 5
env_file: env_file:
- .env - .env.example
rqdashboard: rqdashboard:
image: eoranged/rq-dashboard image: eoranged/rq-dashboard
@@ -71,8 +69,7 @@ services:
depends_on: depends_on:
- redis - redis
env_file: env_file:
- .env - .env.example
volumes: volumes:
apresults:
pgdata: pgdata: