merge: resolve self-hosted identity main conflicts

deploy/docker-compose.server.yml

@@ -17,6 +17,8 @@ services:
       interval: 30s
       timeout: 5s
       retries: 5
+      start_period: 30s
+      start_interval: 1s
 
   web:
     image: ${WEB_IMAGE:-jyotisha-web:local}
@@ -35,6 +37,13 @@ services:
       JYOTISH_API_BASE: http://api:5200
     expose:
       - "3000"
+    healthcheck:
+      test: ["CMD", "node", "-e", "fetch('http://127.0.0.1:3000/api/health').then(r=>{if(!r.ok)process.exit(1)})"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+      start_interval: 1s
     depends_on:
       api:
         condition: service_healthy
@@ -54,7 +63,8 @@ services:
       - caddy_data:/data
       - caddy_config:/config
     depends_on:
-      - web
+      web:
+        condition: service_healthy
 
 volumes:
   caddy_data: