From 8990b80abffbcdf5359020b9984521e054654083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hartmut=20N=C3=B6renberg?= Date: Mon, 6 Apr 2026 18:01:15 +0200 Subject: [PATCH] fix: restore existing runtime data volumes --- docker-compose.worker.yml | 4 ++-- docker-compose.yml | 40 +++++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/docker-compose.worker.yml b/docker-compose.worker.yml index 5ee9c8b..0ff93f8 100644 --- a/docker-compose.worker.yml +++ b/docker-compose.worker.yml @@ -23,8 +23,8 @@ services: environment: - REDIS_URL=${REDIS_URL:?Set REDIS_URL to the main server Redis URL} - POSTGRES_HOST=${POSTGRES_HOST:?Set POSTGRES_HOST to the main server DB host} - - POSTGRES_DB=${POSTGRES_DB:-hartomat} - - POSTGRES_USER=${POSTGRES_USER:-hartomat} + - POSTGRES_DB=${POSTGRES_DB:-schaeffler} + - POSTGRES_USER=${POSTGRES_USER:-schaeffler} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD} - POSTGRES_PORT=${POSTGRES_PORT:-5432} - MINIO_URL=${MINIO_URL:?Set MINIO_URL to the main server MinIO URL} diff --git a/docker-compose.yml b/docker-compose.yml index bd0241e..e0e1a22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,15 +4,15 @@ services: postgres: image: postgres:16-alpine environment: - POSTGRES_DB: ${POSTGRES_DB:-hartomat} - POSTGRES_USER: ${POSTGRES_USER:-hartomat} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-hartomat} + POSTGRES_DB: ${POSTGRES_DB:-schaeffler} + POSTGRES_USER: ${POSTGRES_USER:-schaeffler} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-schaeffler} volumes: - pgdata:/var/lib/postgresql/data ports: - "5432:5432" healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-hartomat}"] + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-schaeffler}"] interval: 5s timeout: 5s retries: 5 @@ -50,9 +50,9 @@ services: dockerfile: Dockerfile command: /start.sh environment: - - POSTGRES_DB=${POSTGRES_DB:-hartomat} - - POSTGRES_USER=${POSTGRES_USER:-hartomat} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-hartomat} + - POSTGRES_DB=${POSTGRES_DB:-schaeffler} + - POSTGRES_USER=${POSTGRES_USER:-schaeffler} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-schaeffler} - POSTGRES_HOST=postgres - POSTGRES_PORT=5432 - REDIS_URL=${REDIS_URL:-redis://redis:6379/0} @@ -91,9 +91,9 @@ services: dockerfile: Dockerfile command: celery -A app.tasks.celery_app worker --loglevel=info -Q step_processing,ai_validation --autoscale=${MAX_CONCURRENCY:-8},${MIN_CONCURRENCY:-2} --concurrency=${MIN_CONCURRENCY:-2} environment: - - POSTGRES_DB=${POSTGRES_DB:-hartomat} - - POSTGRES_USER=${POSTGRES_USER:-hartomat} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-hartomat} + - POSTGRES_DB=${POSTGRES_DB:-schaeffler} + - POSTGRES_USER=${POSTGRES_USER:-schaeffler} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-schaeffler} - POSTGRES_HOST=postgres - POSTGRES_PORT=5432 - REDIS_URL=${REDIS_URL:-redis://redis:6379/0} @@ -125,9 +125,9 @@ services: - BLENDER_VERSION=${BLENDER_VERSION:-5.0.1} command: bash -c "python3 /check_version.py && celery -A app.tasks.celery_app worker --loglevel=info -Q asset_pipeline --autoscale=1,1 --concurrency=1" environment: - - POSTGRES_DB=${POSTGRES_DB:-hartomat} - - POSTGRES_USER=${POSTGRES_USER:-hartomat} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-hartomat} + - POSTGRES_DB=${POSTGRES_DB:-schaeffler} + - POSTGRES_USER=${POSTGRES_USER:-schaeffler} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-schaeffler} - POSTGRES_HOST=postgres - POSTGRES_PORT=5432 - REDIS_URL=${REDIS_URL:-redis://redis:6379/0} @@ -167,9 +167,9 @@ services: - BLENDER_VERSION=${BLENDER_VERSION:-5.0.1} command: bash -c "python3 /check_version.py && celery -A app.tasks.celery_app worker --loglevel=info -Q asset_pipeline_light --autoscale=2,2 --concurrency=2" environment: - - POSTGRES_DB=${POSTGRES_DB:-hartomat} - - POSTGRES_USER=${POSTGRES_USER:-hartomat} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-hartomat} + - POSTGRES_DB=${POSTGRES_DB:-schaeffler} + - POSTGRES_USER=${POSTGRES_USER:-schaeffler} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-schaeffler} - POSTGRES_HOST=postgres - POSTGRES_PORT=5432 - REDIS_URL=${REDIS_URL:-redis://redis:6379/0} @@ -243,6 +243,14 @@ services: volumes: pgdata: + external: true + name: ${PGDATA_VOLUME:-schaefflerautomat_pgdata} uploads: + external: true + name: ${UPLOADS_VOLUME:-schaefflerautomat_uploads} minio-data: + external: true + name: ${MINIO_DATA_VOLUME:-schaefflerautomat_minio-data} optix-cache: # OptiX BVH/kernel pipeline cache (survives render-worker rebuilds) + external: true + name: ${OPTIX_CACHE_VOLUME:-schaefflerautomat_optix-cache}