optimized events

deploy/scripts/deploy.sh

@@ -69,12 +69,16 @@ wm_finish_deployment() {
     if [[ -n "$rollback_images_file" && -f "$rollback_images_file" ]]; then
       wm_log "Deployment fehlgeschlagen; vorheriges Container-Release wird wiederhergestellt."
       wm_use_images_env "$rollback_images_file"
-      wm_compose up --detach --no-build --remove-orphans watermaps nginx
+      wm_compose up --detach --no-build --remove-orphans postgres watermaps nginx
+      wm_wait_for_health postgres 240
       wm_wait_for_health watermaps 240
       wm_wait_for_health nginx 120
       if wm_route_data_ready; then
         wm_smoke_test_route
       fi
+      if wm_marine_features_ready; then
+        wm_smoke_test_features
+      fi
     else
       wm_log "Deployment fehlgeschlagen; für das erste Release existiert noch kein Rollback."
     fi
@@ -99,7 +103,7 @@ requested_app_image="$(wm_env_value "$images_env_file" WATERMAPS_APP_IMAGE)"
 requested_route_data_image="$(wm_env_value "$images_env_file" WATERMAPS_ROUTE_DATA_IMAGE)"
 
 wm_log "Container-Images für Commit $revision werden aus den Registries geladen."
-wm_compose --profile maintenance pull watermaps nginx certbot route-data
+wm_compose --profile maintenance pull watermaps postgres nginx certbot route-data
 
 resolved_app_image="$(wm_resolve_image_digest "$requested_app_image")"
 resolved_route_data_image="$(wm_resolve_image_digest "$requested_route_data_image")"
@@ -114,30 +118,42 @@ resolved_images_file="$(
 chmod 0644 "$resolved_images_file"
 wm_use_images_env "$resolved_images_file"
 
-wm_log "Commit $revision wird mit unveränderlichen Image-Digests gestartet."
-wm_compose up --detach --no-build --remove-orphans watermaps nginx
+wm_log "Persistentes PostGIS wird vor App und Datenimport gestartet."
+wm_compose up --detach --no-build postgres
+wm_wait_for_health postgres 240
 
-wm_wait_for_health watermaps 240
-wm_wait_for_health nginx 120
-
-route_rebuild_required=false
+data_update_required=false
 update_args=()
 if [[ "${WATERMAPS_REBUILD_ROUTE_DATA:-false}" == "true" ]]; then
-  route_rebuild_required=true
+  data_update_required=true
   update_args+=(--force)
 elif ! wm_route_data_ready; then
-  route_rebuild_required=true
+  data_update_required=true
+fi
+if [[ "${WATERMAPS_REBUILD_MARINE_DATA:-false}" == "true" ]]; then
+  data_update_required=true
+  update_args+=(--force-marine)
+elif ! wm_marine_features_ready; then
+  data_update_required=true
 fi
 
-if [[ "$route_rebuild_required" == "true" ]]; then
-  wm_log "Deutschland- und Niederlande-Routingdaten werden sicher vorbereitet."
+if [[ "$data_update_required" == "true" ]]; then
+  wm_log "Deutschland-/Niederlande-Routingdaten und Marine-Features werden sicher vorbereitet."
   WATERMAPS_ROUTE_LOCK_HELD=true \
     "$WM_DEPLOY_DIR/scripts/update-route-data.sh" "${update_args[@]}"
 fi
 
 wm_assert_route_data
+wm_assert_marine_features
+
+wm_log "Commit $revision wird erst mit validierten Routing- und Ereignisdaten gestartet."
+wm_compose up --detach --no-build --remove-orphans postgres watermaps nginx
+
+wm_wait_for_health postgres 240
 wm_wait_for_health watermaps 240
+wm_wait_for_health nginx 120
 wm_smoke_test_route
+wm_smoke_test_features
 
 release_images_file="$WATERMAPS_RUNTIME_DIR/deployments/$revision.env"
 install -m 0644 "$resolved_images_file" "$release_images_file"