optimized events

deploy/compose.production.yml

@@ -7,7 +7,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:?WATERMAPS_POSTGRES_PASSWORD fehlt}
       REDIS_URL: ""
       WATERMAPS_WEB_DIST_PATH: /app/apps/web/dist
       WATERMAPS_LOCAL_FAIRWAYS_PATH: /data/germany-netherlands-fairways.json
@@ -20,6 +21,9 @@ services:
         source: ${WATERMAPS_DATA_DIR:-/srv/watermaps-data}/local
         target: /data
         read_only: true
+    depends_on:
+      postgres:
+        condition: service_healthy
     restart: unless-stopped
     init: true
     security_opt:
@@ -32,7 +36,7 @@ services:
         - node
         - -e
         - >-
-          fetch('http://127.0.0.1:5174/health')
+          fetch('http://127.0.0.1:5174/ready')
           .then(response => { if (!response.ok) process.exit(1) })
           .catch(() => process.exit(1))
       interval: 15s
@@ -40,6 +44,38 @@ services:
       start_period: 15s
       retries: 5
 
+  postgres:
+    image: ${WATERMAPS_POSTGRES_IMAGE:-postgis/postgis:16-3.4}
+    environment:
+      POSTGRES_DB: seacompass
+      POSTGRES_USER: seacompass
+      POSTGRES_PASSWORD: ${WATERMAPS_POSTGRES_PASSWORD:?WATERMAPS_POSTGRES_PASSWORD fehlt}
+    expose:
+      - "5432"
+    volumes:
+      - type: bind
+        source: ${WATERMAPS_DATA_DIR:-/srv/watermaps-data}/postgres
+        target: /var/lib/postgresql/data
+        bind:
+          create_host_path: false
+      - type: bind
+        source: ./database/schema.sql
+        target: /docker-entrypoint-initdb.d/01-schema.sql
+        read_only: true
+    restart: unless-stopped
+    init: true
+    security_opt:
+      - no-new-privileges:true
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - pg_isready --username "$$POSTGRES_USER" --dbname "$$POSTGRES_DB"
+      interval: 10s
+      timeout: 5s
+      start_period: 30s
+      retries: 10
+    stop_grace_period: 60s
+
   nginx:
     image: ${WATERMAPS_NGINX_IMAGE:-nginx:1.30.4-alpine}
     depends_on:
@@ -92,3 +128,22 @@ services:
         source: ${WATERMAPS_DATA_DIR:-/srv/watermaps-data}
         target: /workspace/data
     restart: "no"
+
+  marine-data:
+    image: ${WATERMAPS_ROUTE_DATA_IMAGE:?WATERMAPS_ROUTE_DATA_IMAGE fehlt}
+    profiles: ["maintenance"]
+    entrypoint: ["/workspace/deploy/scripts/prepare-marine-features.sh"]
+    environment:
+      DATABASE_URL: postgresql://seacompass@postgres:5432/seacompass
+      PGPASSWORD: ${WATERMAPS_POSTGRES_PASSWORD:?WATERMAPS_POSTGRES_PASSWORD fehlt}
+      TMPDIR: /workspace/data/tmp
+      WATERMAPS_GEOFABRIK_DIR: /workspace/data/geofabrik
+      WATERMAPS_MARINE_MARKER_PATH: /workspace/data/local/.marine-features.ready
+    volumes:
+      - type: bind
+        source: ${WATERMAPS_DATA_DIR:-/srv/watermaps-data}
+        target: /workspace/data
+    depends_on:
+      postgres:
+        condition: service_healthy
+    restart: "no"