fix: update with demo fixes

Arrow-air · Mar 20, 2024 · 6b14223 · 6b14223
1 parent bbe362b
commit 6b14223
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 15,465 deletions.
diff --git a/.cspell.project-words.txt b/.cspell.project-words.txt
@@ -88,3 +88,5 @@ Vertiport
 vertiport
 Vertiports
 vertiports
+extname
+extrelocatable
diff --git a/local-dev/.env-example b/local-dev/.env-example
@@ -112,3 +112,12 @@ TELEMETRY_TAG=latest-develop
 TELEMETRY_HOST_PORT_GRPC=50012
 TELEMETRY_HOST_PORT_REST=8012
 TELEMETRY_HOST_GRPC=svc-telemetry
+
+# -----------------------------------------------------------
+# svc-discovery
+# -----------------------------------------------------------
+DISCOVERY_IMAGE=ghcr.io/arrow-air/svc-discovery
+DISCOVERY_TAG=latest-develop
+DISCOVERY_HOST_PORT_GRPC=50013
+DISCOVERY_HOST_PORT_REST=8013
+DISCOVERY_HOST_GRPC=svc-discovery
diff --git a/local-dev/.gitignore b/local-dev/.gitignore
@@ -1 +1,3 @@
 .env
+**/logs/**
+**.log
diff --git a/local-dev/docker-compose.yml b/local-dev/docker-compose.yml
@@ -92,6 +92,8 @@ services:
     depends_on:
       arrow-gis:
         condition: service_healthy
+      redis:
+        condition: service_healthy
     volumes:
       - type: volume
         source: postgis-ssl
@@ -182,6 +184,8 @@ services:
   svc-telemetry:
     image: ${TELEMETRY_IMAGE}:${TELEMETRY_TAG}
     container_name: arrow-svc-telemetry
+    ports:
+      - ${TELEMETRY_HOST_PORT_REST}:8000
     extends:
       file: docker-compose/arrow-svc.yml
       service: server
@@ -196,3 +200,17 @@ services:
         condition: service_healthy
     environment:
       - GIS_PUSH_CADENCE_MS=5000
+
+  svc-discovery:
+    image: ${DISCOVERY_IMAGE}:${DISCOVERY_TAG}
+    container_name: arrow-svc-discovery
+    ports:
+      - ${DISCOVERY_HOST_PORT_REST}:8000
+    extends:
+      file: docker-compose/arrow-svc.yml
+      service: server
+    depends_on:
+      svc-gis:
+        condition: service_healthy
+      svc-telemetry:
+        condition: service_healthy
diff --git a/local-dev/docker-compose/arrow-gis/scripts/docker-entrypoint-init.sh b/local-dev/docker-compose/arrow-gis/scripts/docker-entrypoint-init.sh
@@ -10,8 +10,4 @@ fi
 
 # Wait till init scripts completed
 # We can test this by calling one of the functions being created by our init script.
-while ! psql -U svc_gis -d gis -c 'SELECT * FROM arrow.available_routes(1, 1, NOW(), NOW());'
-do
-	sleep 2
-done
 touch "$PGDATA/init_done"