auto-sync: 2026-04-19 14:50:01

tasks/flightradar24/compose/docker-compose.yml

@@ -44,23 +44,24 @@ services:
       - fr24-net
 
   capture:
-    image: alpine:3.20
+    build:
+      context: ../ingest/capture
+      dockerfile: Dockerfile
+    image: fr24-capture
     container_name: fr24-capture
-    command: ["sh", "-c", "echo 'capture placeholder: read RTL-SDR and write raw_packets'; tail -f /dev/null"]
     environment:
       <<: *common-env
       SERVICE_ROLE: capture
     devices:
       - "/dev/bus/usb:/dev/bus/usb"
     volumes:
-      - ../ingest:/app
       - ../logs/capture:/var/log/fr24
       - ../backup:/backup
     depends_on:
       postgres:
         condition: service_healthy
     healthcheck:
-      test: ["CMD-SHELL", "test -f /tmp/capture-ready || exit 1"]
+      test: ["CMD-SHELL", "test -f /tmp/capture-ready && python -c 'import psycopg2' 2>/dev/null || exit 1"]
       interval: 30s
       timeout: 5s
       retries: 3
@@ -70,14 +71,15 @@ services:
       - fr24-net
 
   preprocess:
-    image: alpine:3.20
+    build:
+      context: ../ingest/preprocess
+      dockerfile: Dockerfile
+    image: fr24-preprocess
     container_name: fr24-preprocess
-    command: ["sh", "-c", "echo 'preprocess placeholder: normalize data and build flights/tracks'; tail -f /dev/null"]
     environment:
       <<: *common-env
       SERVICE_ROLE: preprocess
     volumes:
-      - ../ingest:/app
       - ../logs/preprocess:/var/log/fr24
       - ../backup:/backup
     depends_on:
@@ -86,7 +88,7 @@ services:
       capture:
         condition: service_started
     healthcheck:
-      test: ["CMD-SHELL", "test -f /tmp/preprocess-ready || exit 1"]
+      test: ["CMD-SHELL", "test -f /tmp/preprocess-ready && python -c 'import psycopg2' 2>/dev/null || exit 1"]
       interval: 30s
       timeout: 5s
       retries: 3
@@ -96,9 +98,11 @@ services:
       - fr24-net
 
   api:
-    image: alpine:3.20
+    build:
+      context: ../frontend
+      dockerfile: Dockerfile
+    image: fr24-api
     container_name: fr24-api
-    command: ["sh", "-c", "echo 'api placeholder: noisemap reader and UI endpoints'; tail -f /dev/null"]
     environment:
       <<: *common-env
       SERVICE_ROLE: api
@@ -106,7 +110,6 @@ services:
     ports:
       - "${API_PUBLISHED_PORT:-8080}:8080"
     volumes:
-      - ../frontend:/app
       - ../logs/api:/var/log/fr24
     depends_on:
       postgres:
@@ -114,7 +117,7 @@ services:
       preprocess:
         condition: service_started
     healthcheck:
-      test: ["CMD-SHELL", "test -f /tmp/api-ready || exit 1"]
+      test: ["CMD-SHELL", "wget -qO- http://localhost:8080/health || exit 1"]
       interval: 30s
       timeout: 5s
       retries: 3