updating docker compose

Author: senkevinli

README.md

@@ -31,7 +31,11 @@ This repository heavily depends on Docker. Make sure both Docker and Docker
 Compose (which is used for testing) are installed on your machine.
 
 To build all the images at once, simply run `make` in the top-level directory.
-If you would like to build specific images, you can either pass the name of the
+*NOTE*: by default, top-level `make` creates the `uavaustin/image-rec-auto` image
+for x86 devices. If you would like to build for the Jetson, initialize the `JETSON`
+environment variable and build in the specific directory.
+
+For building specific images, you can either pass the name of the
 service (e.g. `make interop-proxy`) or you can call `make` from inside the
 service's directory. Note that calling `make` from the service directory does
 not ensure that build-time prerequisites are satisfied.

config/ground/docker-compose.yml

@@ -105,6 +105,23 @@ services:
       - ./imagery:/opt/imagery
     restart: unless-stopped
 
+  image-rec-redis:
+    image: redis:alpine
+    command: redis-server --save "" --appendonly no
+    ports:
+      - '6379:6379'
+    networks:
+      - ground-net
+
+  image-rec-master:
+    image: uavaustin/image-rec-master
+    environment:
+      - REDIS_HOST=image-rec-redis
+    ports:
+      - '8082:8082'
+    networks:
+      - ground-net
+
 networks:
   ground-net:
 

config/plane/docker-compose.yml

@@ -55,6 +55,18 @@ services:
     volumes:
       - './imagery:/opt/imagery'
     restart: unless-stopped
+  
+  image-rec-auto:
+    image: uavaustin/image-rec-auto-l4t
+    environment:
+      - IMAGERY_HOST=imagery-plane
+      - IMAGERY_PORT=8081
+      - IMAGE_REC_MASTER_HOST=image-rec-master
+      - IMAGE_REC_MASTER_PORT=8082
+      - FETCH_INTERVAL=1000
+    networks:
+      - plane-net
+    restart: unless-stopped
 
 networks:
   plane-net:

services/image-rec-auto/.gitignore

@@ -14,4 +14,4 @@ messages/
 # pytest
 .pytest_cache/
 
-coverage
+coverage/

services/image-rec-auto/service/__init__.py

@@ -64,7 +64,7 @@ def run_iter(self) -> None:
         t_3 = util.curr_time()
         logging.info(f"{len(targets)} targets found in {t_3 - t_2:d} ms")
 
-        if targets:
+        if targets and len(targets) > 0:
             ret = self._queue_targets(image_id, image_proto, image, targets)
             t_4 = util.curr_time()