optimized events

docker-compose.yml

@@ -10,7 +10,8 @@ services:
       NODE_ENV: production
       HOST: 0.0.0.0
       PORT: 5174
-      DATABASE_URL: ""
+      DATABASE_URL: postgresql://seacompass@postgres:5432/seacompass
+      PGPASSWORD: "${WATERMAPS_POSTGRES_PASSWORD:-seacompass}"
       REDIS_URL: ""
       WATERMAPS_WEB_DIST_PATH: /app/apps/web/dist
       WATERMAPS_LOCAL_FAIRWAYS_PATH: /data/germany-netherlands-fairways.json
@@ -23,6 +24,9 @@ services:
         read_only: true
         bind:
           create_host_path: false
+    depends_on:
+      postgres:
+        condition: service_healthy
     restart: unless-stopped
     healthcheck:
       test:
@@ -30,7 +34,7 @@ services:
           "CMD",
           "node",
           "-e",
-          "fetch('http://127.0.0.1:5174/health').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"
+          "fetch('http://127.0.0.1:5174/ready').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"
         ]
       interval: 30s
       timeout: 5s
@@ -38,12 +42,11 @@ services:
       retries: 3
 
   postgres:
-    profiles: ["postgis"]
     image: postgis/postgis:16-3.4
     environment:
       POSTGRES_DB: seacompass
       POSTGRES_USER: seacompass
-      POSTGRES_PASSWORD: seacompass
+      POSTGRES_PASSWORD: "${WATERMAPS_POSTGRES_PASSWORD:-seacompass}"
     ports:
       - "${WATERMAPS_POSTGRES_PORT:-${SEA_COMPASS_POSTGRES_PORT:-55432}}:5432"
     volumes:
@@ -55,6 +58,28 @@ services:
       timeout: 5s
       retries: 5
 
+  marine-data:
+    profiles: ["postgis"]
+    build:
+      context: .
+      dockerfile: deploy/route-data.Dockerfile
+    image: watermaps-route-data:local
+    entrypoint: ["/workspace/deploy/scripts/prepare-marine-features.sh"]
+    environment:
+      DATABASE_URL: postgresql://seacompass@postgres:5432/seacompass
+      PGPASSWORD: "${WATERMAPS_POSTGRES_PASSWORD:-seacompass}"
+      TMPDIR: /workspace/data/tmp
+      WATERMAPS_GEOFABRIK_DIR: /workspace/data/geofabrik
+      WATERMAPS_MARINE_MARKER_PATH: /workspace/data/local/.marine-features.ready
+    volumes:
+      - type: bind
+        source: ./data
+        target: /workspace/data
+    depends_on:
+      postgres:
+        condition: service_healthy
+    restart: "no"
+
   redis:
     profiles: ["postgis"]
     image: redis:7-alpine