diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 4cd7d9c4..b66ace54 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -28,7 +28,7 @@ # APP_MAIL_FROM sender address (e.g. noreply@raddatz.cloud) networks: - archive-net: + archiv-net: driver: bridge volumes: @@ -48,7 +48,7 @@ services: volumes: - postgres-data:/var/lib/postgresql/data networks: - - archive-net + - archiv-net healthcheck: test: ["CMD-SHELL", "pg_isready -U archiv -d archiv"] interval: 10s @@ -67,7 +67,7 @@ services: volumes: - minio-data:/data networks: - - archive-net + - archiv-net healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] interval: 30s @@ -85,7 +85,7 @@ services: minio: condition: service_healthy networks: - - archive-net + - archiv-net environment: MINIO_PASSWORD: ${MINIO_PASSWORD} MINIO_APP_PASSWORD: ${MINIO_APP_PASSWORD} @@ -101,7 +101,7 @@ services: restart: unless-stopped profiles: ["staging"] networks: - - archive-net + - archiv-net healthcheck: # TCP-port open check via BusyBox `nc`. The previous wget-based probe # introduced a non-obvious binary dependency on the mailpit image; a @@ -138,7 +138,7 @@ services: # must NOT be reachable here. Do not widen to `*`. ALLOWED_PDF_HOSTS: "minio" networks: - - archive-net + - archiv-net healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/health"] interval: 10s @@ -186,7 +186,7 @@ services: SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: ${MAIL_SMTP_AUTH:-true} SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: ${MAIL_STARTTLS_ENABLE:-true} networks: - - archive-net + - archiv-net healthcheck: test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"] interval: 15s @@ -210,7 +210,7 @@ services: API_INTERNAL_URL: http://backend:8080 ORIGIN: https://${APP_DOMAIN} networks: - - archive-net + - archiv-net healthcheck: test: ["CMD-SHELL", "wget -qO- http://localhost:3000/login >/dev/null 2>&1 || exit 1"] interval: 15s diff --git a/docker-compose.yml b/docker-compose.yml index ee850922..952e3074 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - "${PORT_DB}:5432" networks: - - archive-net + - archiv-net healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] interval: 5s @@ -35,7 +35,7 @@ services: - "${PORT_MINIO_API}:9000" # API Port - "${PORT_MINIO_CONSOLE}:9001" # Web-Oberfläche networks: - - archive-net + - archiv-net healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] interval: 30s @@ -56,7 +56,7 @@ services: exit 0; " networks: - - archive-net + - archiv-net # --- Mail catcher: Mailpit (dev only) --- # Catches all outgoing emails and displays them in a web UI. @@ -69,7 +69,7 @@ services: - "${PORT_MAILPIT_UI:-8025}:8025" # Web UI - "${PORT_MAILPIT_SMTP:-1025}:1025" # SMTP networks: - - archive-net + - archiv-net # --- OCR: Python microservice (Surya + Kraken) --- # Single-node only: OCR training reloads the model in-process after each run. @@ -99,7 +99,7 @@ services: OCR_CLAHE_TILE_SIZE: "8" # CLAHE tile grid size (NxN tiles per page) OCR_MAX_CACHED_MODELS: "2" # LRU cache; each model ~500 MB, so 2 = ~1 GB resident networks: - - archive-net + - archiv-net healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/health"] interval: 10s @@ -150,7 +150,7 @@ services: ports: - "${PORT_BACKEND}:8080" networks: - - archive-net + - archiv-net healthcheck: test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"] interval: 15s @@ -185,10 +185,10 @@ services: ports: - "${PORT_FRONTEND}:5173" networks: - - archive-net + - archiv-net networks: - archive-net: + archiv-net: driver: bridge volumes: diff --git a/docs/infrastructure/ci-gitea.md b/docs/infrastructure/ci-gitea.md index c6180c5e..3f96583e 100644 --- a/docs/infrastructure/ci-gitea.md +++ b/docs/infrastructure/ci-gitea.md @@ -166,7 +166,7 @@ jobs: timeout 30 bash -c \ 'until docker compose -f docker-compose.yml -f docker-compose.ci.yml exec -T db pg_isready -U archive_user; do sleep 2; done' - name: Connect job container to compose network - run: docker network connect familienarchiv_archive-net $(cat /etc/hostname) + run: docker network connect familienarchiv_archiv-net $(cat /etc/hostname) - uses: actions/setup-java@v4 with: java-version: '21'