Merge pull request IQTLabs#47 from mchadwick-iqt/main

Remove custom MQTT Container Build, Add in Config, General Cleanup

.github/workflows/dockerbuild.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Build Images
       env: 
         # Every folder in the repo that has a Dockerfile within it, comma separated 
-        DOCKERFOLDERS: "edge-detect/ai,tracker,piaware,pan-tilt-pi,notebook-server,mqtt,egi,axis-ptz"
+        DOCKERFOLDERS: "edge-detect/ai,tracker,piaware,pan-tilt-pi,notebook-server,egi,axis-ptz"
         PROJECT_NAME: "skyscan"
       run: |
         IFS=","

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 IQT Labs, LLC
+   Copyright 2020-2023 IQT Labs, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -96,8 +96,7 @@ The third pipeline uses the [YOLTv4 model](https://github.com/avanetten/yoltv4)
 Follow the steps below for installing the edge software.
 
 1. [Install and Configure Raspberry Pi](./configure-pi.md)
-2. [Configure PiAware](configure-piaware.md)
-3. [Configure Camera](./configure-camera.md)
+2. [Configure Camera](./configure-camera.md)
 
 ## System Operation
 After the system has been installed, follow the steps below to set up the hardware and start the software.

config.sh

@@ -0,0 +1,20 @@
+printf "\n\nCreating SkyScan Project Folder..."
+mkdir ./SkyScan
+cd SkyScan
+
+printf "\n\nDownload Docker-Compose SkyScan Files..."
+curl -fsSL https://raw.githubusercontent.com/IQTLabs/SkyScan/main/docker-compose.yml -o docker-compose.yml
+curl -fsSL https://raw.githubusercontent.com/IQTLabs/SkyScan/main/env-example -o .env
+
+printf "\n\nDownload Aircraft Database..."
+mkdir ./data
+curl -fsSL https://opensky-network.org/datasets/metadata/aircraftDatabase.csv -o ./data/aircraftDatabase.csv
+
+printf "\n\nDownload Docker Containers..."
+docker-compose pull
+
+printf "\n\n\n\n--------------------------------------------------------------------"
+printf "\n1: Configure network interface to same as Axis Camera (192.168.1.x)"
+printf "\n2: Configure .env file appropriately"
+printf "\n3: docker-compose up"
+printf "\n--------------------------------------------------------------------\n\n"

docker-compose.yml

@@ -49,7 +49,7 @@ services:
       - mqtt
 
   mqtt:
-    image: iqtlabs/skyscan-mqtt
+    image: iqtlabs/edgetech-mqtt
     ports:
         - "9001:9001"
         - "1883:1883"