refactor(compose): rename docker network archive-net to archiv-net

The docker network was the only `archive-*` identifier in either
compose file; everything else (user, db, bucket, service account,
project name) uses the `archiv-*` spelling. Reviewers' eyes stuttered
on it on the prod compose review (round 2 of PR #499 — Markus and
Tobi). Renamed in both prod and dev compose for consistency and
updated the single doc reference to the dev-project-prefixed
network name.

Operational note: applying this change to a running stack will
recreate the network on the next `docker compose up`; containers
restart, named volumes are unaffected.

`docker compose config --quiet` passes for both compose files and
for the staging profile. Sweep confirms zero `archive-net`
references remain in the tree.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Marcel
2026-05-11 14:10:39 +02:00
parent 440a191138
commit 9adde3cd89
3 changed files with 17 additions and 17 deletions

View File

@@ -28,7 +28,7 @@
# APP_MAIL_FROM sender address (e.g. noreply@raddatz.cloud) # APP_MAIL_FROM sender address (e.g. noreply@raddatz.cloud)
networks: networks:
archive-net: archiv-net:
driver: bridge driver: bridge
volumes: volumes:
@@ -48,7 +48,7 @@ services:
volumes: volumes:
- postgres-data:/var/lib/postgresql/data - postgres-data:/var/lib/postgresql/data
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U archiv -d archiv"] test: ["CMD-SHELL", "pg_isready -U archiv -d archiv"]
interval: 10s interval: 10s
@@ -67,7 +67,7 @@ services:
volumes: volumes:
- minio-data:/data - minio-data:/data
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 30s interval: 30s
@@ -85,7 +85,7 @@ services:
minio: minio:
condition: service_healthy condition: service_healthy
networks: networks:
- archive-net - archiv-net
environment: environment:
MINIO_PASSWORD: ${MINIO_PASSWORD} MINIO_PASSWORD: ${MINIO_PASSWORD}
MINIO_APP_PASSWORD: ${MINIO_APP_PASSWORD} MINIO_APP_PASSWORD: ${MINIO_APP_PASSWORD}
@@ -101,7 +101,7 @@ services:
restart: unless-stopped restart: unless-stopped
profiles: ["staging"] profiles: ["staging"]
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
# TCP-port open check via BusyBox `nc`. The previous wget-based probe # TCP-port open check via BusyBox `nc`. The previous wget-based probe
# introduced a non-obvious binary dependency on the mailpit image; a # 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 `*`. # must NOT be reachable here. Do not widen to `*`.
ALLOWED_PDF_HOSTS: "minio" ALLOWED_PDF_HOSTS: "minio"
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8000/health"] test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
interval: 10s interval: 10s
@@ -186,7 +186,7 @@ services:
SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: ${MAIL_SMTP_AUTH:-true} SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: ${MAIL_SMTP_AUTH:-true}
SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: ${MAIL_STARTTLS_ENABLE:-true} SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: ${MAIL_STARTTLS_ENABLE:-true}
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"] test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"]
interval: 15s interval: 15s
@@ -210,7 +210,7 @@ services:
API_INTERNAL_URL: http://backend:8080 API_INTERNAL_URL: http://backend:8080
ORIGIN: https://${APP_DOMAIN} ORIGIN: https://${APP_DOMAIN}
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -qO- http://localhost:3000/login >/dev/null 2>&1 || exit 1"] test: ["CMD-SHELL", "wget -qO- http://localhost:3000/login >/dev/null 2>&1 || exit 1"]
interval: 15s interval: 15s

View File

@@ -13,7 +13,7 @@ services:
ports: ports:
- "${PORT_DB}:5432" - "${PORT_DB}:5432"
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
interval: 5s interval: 5s
@@ -35,7 +35,7 @@ services:
- "${PORT_MINIO_API}:9000" # API Port - "${PORT_MINIO_API}:9000" # API Port
- "${PORT_MINIO_CONSOLE}:9001" # Web-Oberfläche - "${PORT_MINIO_CONSOLE}:9001" # Web-Oberfläche
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 30s interval: 30s
@@ -56,7 +56,7 @@ services:
exit 0; exit 0;
" "
networks: networks:
- archive-net - archiv-net
# --- Mail catcher: Mailpit (dev only) --- # --- Mail catcher: Mailpit (dev only) ---
# Catches all outgoing emails and displays them in a web UI. # 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_UI:-8025}:8025" # Web UI
- "${PORT_MAILPIT_SMTP:-1025}:1025" # SMTP - "${PORT_MAILPIT_SMTP:-1025}:1025" # SMTP
networks: networks:
- archive-net - archiv-net
# --- OCR: Python microservice (Surya + Kraken) --- # --- OCR: Python microservice (Surya + Kraken) ---
# Single-node only: OCR training reloads the model in-process after each run. # 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_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 OCR_MAX_CACHED_MODELS: "2" # LRU cache; each model ~500 MB, so 2 = ~1 GB resident
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8000/health"] test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
interval: 10s interval: 10s
@@ -150,7 +150,7 @@ services:
ports: ports:
- "${PORT_BACKEND}:8080" - "${PORT_BACKEND}:8080"
networks: networks:
- archive-net - archiv-net
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"] test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"]
interval: 15s interval: 15s
@@ -185,10 +185,10 @@ services:
ports: ports:
- "${PORT_FRONTEND}:5173" - "${PORT_FRONTEND}:5173"
networks: networks:
- archive-net - archiv-net
networks: networks:
archive-net: archiv-net:
driver: bridge driver: bridge
volumes: volumes:

View File

@@ -166,7 +166,7 @@ jobs:
timeout 30 bash -c \ 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' '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 - 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 - uses: actions/setup-java@v4
with: with:
java-version: '21' java-version: '21'