From 58edd548355d0428f6a8ec077f64e49801cbb4eb Mon Sep 17 00:00:00 2001 From: Zeecka Date: Wed, 31 Dec 2025 15:59:13 +0100 Subject: [PATCH] remove cleanup in compose and docker --- Dockerfile | 2 +- compose.dev.yml | 9 +++------ compose.yml | 9 ++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index cff09e7..1c0ce92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,4 +42,4 @@ RUN apt-get remove -y wget && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -CMD ["sh", "-c", "rm -rf /aperisolve/results/* && gunicorn -w 4 -b 0.0.0.0:5000 --access-logfile - --error-logfile - --log-level info --capture-output aperisolve.wsgi:application"] +CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:5000", "--access-logfile", "-", "--error-logfile", "-", "--log-level", "info", "--capture-output", "aperisolve.wsgi:application"] diff --git a/compose.dev.yml b/compose.dev.yml index 9df9dea..c10943f 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -4,13 +4,12 @@ services: build: . container_name: aperisolve-web restart: always - command: ["/bin/sh", "-c", "rm -rf /aperisolve/results/* && flask --app aperisolve.app run --host=0.0.0.0 --port=5000"] - #command: ["/bin/sh", "-c", "flask --app aperisolve.app run --host=0.0.0.0 --port=5000"] + command: ["/bin/sh", "-c", "flask --app aperisolve.app run --host=0.0.0.0 --port=5000"] ports: - "5000:5000" volumes: - ./aperisolve:/aperisolve - - apresults:/aperisolve/results # Shared named volume (renamed) + - apresults:/aperisolve/results depends_on: postgres: condition: service_healthy @@ -29,8 +28,7 @@ services: build: . container_name: aperisolve-worker restart: always - command: ["/bin/sh", "-c", "rm -rf /aperisolve/results/* && rq worker default --url redis://redis:6379/0"] - #command: ["/bin/sh", "-c", "rq worker default --url redis://redis:6379/0"] + command: ["/bin/sh", "-c", "rq worker default --url redis://redis:6379/0"] volumes: - ./aperisolve:/aperisolve - apresults:/aperisolve/results # Shared named volume (renamed) @@ -54,7 +52,6 @@ services: image: postgres:18 container_name: postgres restart: always - entrypoint: ["/bin/sh", "-c", "rm -rf /var/lib/postgresql/* && docker-entrypoint.sh postgres"] volumes: - pgdata:/var/lib/postgresql healthcheck: diff --git a/compose.yml b/compose.yml index afa902f..2afcb73 100644 --- a/compose.yml +++ b/compose.yml @@ -6,8 +6,8 @@ services: restart: always ports: - "5000:5000" - tmpfs: - - /aperisolve/results + volumes: + - apresults:/aperisolve/results depends_on: postgres: condition: service_healthy @@ -30,8 +30,8 @@ services: container_name: aperisolve-worker restart: always command: rq worker default --url redis://redis:6379/0 - tmpfs: - - /aperisolve/results + volumes: + - apresults:/aperisolve/results depends_on: - redis - postgres @@ -42,7 +42,6 @@ services: image: postgres:18 container_name: postgres restart: always - entrypoint: ["/bin/sh", "-c", "rm -rf /var/lib/postgresql/* && docker-entrypoint.sh postgres"] volumes: - pgdata:/var/lib/postgresql healthcheck: