Merge pull request #1189 from anarkiwi/split

move less commonly used services to separate yml, add linting of comp…

.github/workflows/ci-test.yml

@@ -39,6 +39,7 @@ jobs:
             sox \
             uhd-host \
             wget \
+            yamllint \
           && grep -h 'git clone' docker/*|grep -v pytorch|sed -E 's/RUN\s+git clone\s+//g'|sort|uniq|xargs -L1 git clone
       - name: install gnuradio
         run: |
@@ -57,6 +58,9 @@ jobs:
           poetry install --no-interaction -C utils/mavlink-api && \
           poetry install --no-interaction && \
           sudo dpkg -r --force-depends python3-numpy
+      - name: Code Quality - yamllint
+        run: |
+          yamllint -s *yml
       - name: Code Quality - Black
         run: |
           poetry run black augment --check

docs/4-OPERATION.md

@@ -81,7 +81,7 @@ VOL_PREFIX=/flash/gamutrf docker compose -f orchestrator.yml up mqtt gamutrf wat
 
 ### Deploy signal detector
 ```bash
-VOL_PREFIX=/flash/gamutrf FREQ_START=2.4e9 FREQ_END=5.8e9 docker compose -f orchestrator.yml up mqtt gamutrf waterfall sigfinder -d
+VOL_PREFIX=/flash/gamutrf FREQ_START=2.4e9 FREQ_END=5.8e9 docker compose -f orchestrator.yml -f sigfinder.yml up mqtt gamutrf waterfall sigfinder -d
 ```
 
 ### Deploy Birdseye

orchestrator.yml

@@ -1,9 +1,13 @@
+---
 version: "3.3"
 networks:
   gamutrf:
     driver: bridge
     driver_opts:
       com.docker.network.driver.mtu: 9000
+  default:
+    external: true
+    name: none
 services:
   compass:
     restart: always
@@ -104,29 +108,6 @@ services:
       interval: 10s
       timeout: 10s
       retries: 3
-  sigfinder:
-    restart: always
-    image: iqtlabs/gamutrf:latest
-    shm_size: 128m
-    privileged: true
-    networks:
-      - gamutrf
-    ports:
-      - '80:80'
-      - '9002:9000'
-    volumes:
-      - '${VOL_PREFIX}:/logs'
-    command:
-      - gamutrf-sigfinder
-      - --scanners=gamutrf:10000
-      - --log=/logs/scan.log
-      - --detection_type=narrowband
-      - --record_secs=1
-      - --max_recorder_signals=5
-      - --db_rolling_factor=0
-    environment:
-      - "PEAK_TRIGGER=0"
-      - "PIN_TRIGGER=17"
   waterfall:
     restart: always
     image: iqtlabs/gamutrf-waterfall:latest
@@ -149,14 +130,3 @@ services:
       - --height=6
       - --min_freq=0
       - --max_freq=0
-  watchtower:
-    image: containrrr/watchtower:latest
-    restart: always
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-    environment:
-      - "WATCHTOWER_POLL_INTERVAL=3600"
-      - "WATCHTOWER_CLEANUP=true"
-      - "WATCHTOWER_INCLUDE_RESTARTING=true"
-      - "WATCHTOWER_INCLUDE_STOPPED=true"
-      - "WATCHTOWER_REVIVE_STOPPED=true"

sigfinder.yml

@@ -0,0 +1,28 @@
+---
+version: "3.3"
+networks:
+  gamutrf:
+services:
+  sigfinder:
+    restart: always
+    image: iqtlabs/gamutrf:latest
+    shm_size: 128m
+    privileged: true
+    networks:
+      - gamutrf
+    ports:
+      - '80:80'
+      - '9002:9000'
+    volumes:
+      - '${VOL_PREFIX}:/logs'
+    command:
+      - gamutrf-sigfinder
+      - --scanners=gamutrf:10000
+      - --log=/logs/scan.log
+      - --detection_type=narrowband
+      - --record_secs=1
+      - --max_recorder_signals=5
+      - --db_rolling_factor=0
+    environment:
+      - "PEAK_TRIGGER=0"
+      - "PIN_TRIGGER=17"

specgram.yml

@@ -1,3 +1,4 @@
+---
 # On Pi4/Ubuntu, also requires systemd.unified_cgroup_hierarchy=0 added to
 # /boot/firmware/cmdline.txt, to fall back to cgroup v1.
 version: "3.3"

torchserve-cuda.yml

@@ -1,7 +1,7 @@
+---
 version: "3.3"
 networks:
   gamutrf:
-    driver: bridge
 services:
   torchserve:
     restart: always
@@ -24,5 +24,6 @@ services:
               count: 1
               capabilities: [gpu]
     command:
-      # can be multiple models, e.g. mini2_snr=mini2_snr.mar,another_mini2_snr=another_mini2_snr.mar
+      # can be multiple models
+      # e.g. mini2_snr=mini2_snr.mar,another_mini2_snr=another_mini2_snr.mar
       - --models mini2_snr=mini2_snr.mar

torchserve.yml

@@ -1,7 +1,7 @@
+---
 version: "3.3"
 networks:
   gamutrf:
-    driver: bridge
 services:
   torchserve:
     restart: always

watchtower.yml

@@ -0,0 +1,16 @@
+---
+version: "3.3"
+networks:
+  gamutrf:
+services:
+  watchtower:
+    image: containrrr/watchtower:latest
+    restart: always
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"
+    environment:
+      - "WATCHTOWER_POLL_INTERVAL=3600"
+      - "WATCHTOWER_CLEANUP=true"
+      - "WATCHTOWER_INCLUDE_RESTARTING=true"
+      - "WATCHTOWER_INCLUDE_STOPPED=true"
+      - "WATCHTOWER_REVIVE_STOPPED=true"

worker.yml

@@ -1,8 +1,12 @@
+---
 # On Pi4/Ubuntu, also requires systemd.unified_cgroup_hierarchy=0 added to
 # /boot/firmware/cmdline.txt, to fall back to cgroup v1.
 version: "3.3"
 networks:
   gamutrf:
+  default:
+    external: true
+    name: none
 services:
   worker:
     restart: always
@@ -34,19 +38,8 @@ services:
       - --rxb=62914560
       - '--gain=${GAIN}'
       - --qsize=5
-      #- --rssi_threshold=-110
-      #- --rssi_throttle=10
-      #- --use_external_gps
-      #- --use_external_heading
-      #- --external_gps_server=$ORCHESTRATOR
-  watchtower:
-    image: containrrr/watchtower:latest
-    restart: always
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-    environment:
-      - "WATCHTOWER_POLL_INTERVAL=3600"
-      - "WATCHTOWER_CLEANUP=true"
-      - "WATCHTOWER_INCLUDE_RESTARTING=true"
-      - "WATCHTOWER_INCLUDE_STOPPED=true"
-      - "WATCHTOWER_REVIVE_STOPPED=true"
+      # - --rssi_threshold=-110
+      # - --rssi_throttle=10
+      # - --use_external_gps
+      # - --use_external_heading
+      # - --external_gps_server=$ORCHESTRATOR