Skip to content

Commit

Permalink
Hotfixes for docker-compose and env
Browse files Browse the repository at this point in the history
  • Loading branch information
mchadwick-iqt authored Jul 29, 2023
1 parent 464919b commit 8174703
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 26 deletions.
65 changes: 65 additions & 0 deletions docker-compose-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
version: '3'

services:

tracker:
image: iqtlabs/skyscan-tracker
build:
context: ./tracker
dockerfile: ./Dockerfile
command: "./flighttracker.py -m mqtt -H piaware -l ${LAT} -L ${LONG} -a ${ALT} -P skyscan/planes/json -T skyscan/flight/json -M ${MIN_ELEVATION} -c ${CAMERA_LEAD}"
volumes:
- ./data:/data
ports:
- 5000:5000
depends_on:
- mqtt
restart: unless-stopped

axis-ptz:
image: iqtlabs/skyscan-axis-ptz
build: ./axis-ptz
command: "./camera.py -m mqtt -t skyscan/flight/json -u ${AXIS_USERNAME} -p ${AXIS_PASSWORD} -a ${AXIS_IP} -z ${CAMERA_ZOOM} -s ${CAMERA_MOVE_SPEED} -d ${CAMERA_DELAY} --lat ${LAT} --lon ${LONG} --alt ${ALT}"
volumes:
- ./capture:/app/capture
depends_on:
- mqtt
restart: unless-stopped

piaware:
image: iqtlabs/skyscan-piaware
build: ./piaware
tty: true
container_name: piaware
devices:
- /dev/bus/usb:/dev/bus/usb
ports:
- 8080:80
- 30003:30003
- 30005:30005
environment:
- TZ=${TZ}
- LAT=${LAT}
- LONG=${LONG}
- FEEDER_ID=${FEEDER_ID}
- RECEIVER_TYPE=rtlsdr
- DUMP1090_DEVICE=${RTL_DEV}
restart: unless-stopped


notebook:
image: iqtlabs/skyscan-notebook-server
build: ./notebook-server
ports:
- "8888:8888"
restart: unless-stopped
depends_on:
- mqtt

mqtt:
image: iqtlabs/skyscan-mqtt
build: ./mqtt
ports:
- "9001:9001"
- "1883:1883"
restart: unless-stopped
8 changes: 1 addition & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
version: '3.7'
version: '3'

services:

tracker:
image: iqtlabs/skyscan-tracker:${RELEASE_NAME}
build: ./tracker
command: "./flighttracker.py -m mqtt -H piaware -l ${LAT} -L ${LONG} -a ${ALT} -P skyscan/planes/json -T skyscan/flight/json -M ${MIN_ELEVATION} -c ${CAMERA_LEAD}"
volumes:
- ./data:/data
Expand All @@ -16,7 +15,6 @@ services:

axis-ptz:
image: iqtlabs/skyscan-axis-ptz:${RELEASE_NAME}
build: ./axis-ptz
command: "./camera.py -m mqtt -t skyscan/flight/json -u ${AXIS_USERNAME} -p ${AXIS_PASSWORD} -a ${AXIS_IP} -z ${CAMERA_ZOOM} -s ${CAMERA_MOVE_SPEED} -d ${CAMERA_DELAY} --lat ${LAT} --lon ${LONG} --alt ${ALT}"
volumes:
- ./capture:/app/capture
Expand All @@ -26,7 +24,6 @@ services:

piaware:
image: iqtlabs/skyscan-piaware:${RELEASE_NAME}
build: ./piaware
tty: true
container_name: piaware
devices:
Expand All @@ -43,11 +40,9 @@ services:
- RECEIVER_TYPE=rtlsdr
- DUMP1090_DEVICE=${RTL_DEV}
restart: unless-stopped


notebook:
image: iqtlabs/skyscan-notebook-server:${RELEASE_NAME}
build: ./notebook-server
ports:
- "8888:8888"
restart: unless-stopped
Expand All @@ -56,7 +51,6 @@ services:

mqtt:
image: iqtlabs/skyscan-mqtt:${RELEASE_NAME}
build: ./mqtt
ports:
- "9001:9001"
- "1883:1883"
Expand Down
63 changes: 44 additions & 19 deletions env-example
Original file line number Diff line number Diff line change
@@ -1,19 +1,44 @@
TZ="New York" #Local timezone in "TZ database name" format. https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
LAT=38.890022390623265 # Latitude of the camera
LONG=-77.03513244930217 # Longitude of the camera
ALT=170 # Altitude of the camera, this should be in METERS above sea level
ROLL=0 # Roll Angle of Camera Mount from Inertial
PITCH=0 # Pitch Angle of Camera Mount from Inertial
YAW=0 # Yaw Angle of Camera Mount from Inertial
MIN_ELEVATION=45 # The minimum elevation for the camera.
FEEDER_ID=long-api-key-goes-here # Your FlightAware feeder ID (required)
AXIS_USERNAME=user # The username for the Axis camera
AXIS_PASSWORD=PLACEHOLDER_FOR_PASSWORD # The Password for the Axis camera
AXIS_IP=192.168.1.1 # The IP address of the camera
CAMERA_MOVE_SPEED=50 # The speed at which the Axis will move for Pan/Tilt (0-100)
CAMERA_DELAY=0.5 # How many seconds after issuing a Pan/Tilt command should a picture be taken
CAMERA_ZOOM=9999 # The zoom setting for the camera (0-9999)
CAMERA_LEAD=0.25 # How many seconds ahead of a plane's predicted location should the camera be positioned
RTL_DEV=1 # The device ID for the RTL-SDR - set using the rtl_eeprom program
GPS_SERIAL=/dev/ttyACM0 # GPS module serial port
RELEASE_NAME=v2.1 # The docker image versions to use
# Local timezone in "TZ database name" format. https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
TZ="New York"

# Latitude of the camera
LAT=38.890022390623265
# Longitude of the camera
LONG=-77.03513244930217
# Altitude of the camera, this should be in METERS above sea level
ALT=170

# Roll Angle of Camera Mount from Inertial
ROLL=0
# Pitch Angle of Camera Mount from Inertial
PITCH=0
# Yaw Angle of Camera Mount from Inertial
YAW=0

# The minimum elevation for the camera.
MIN_ELEVATION=0

# Your FlightAware feeder ID (required)
FEEDER_ID=long-api-key-goes-here

# ## AXIS CAMERA SETTINGS
# The username for the Axis camera
AXIS_USERNAME=user
# The Password for the Axis camera
AXIS_PASSWORD=PLACEHOLDER_FOR_PASSWORD
# The IP address of the camera
AXIS_IP=192.168.1.1
# The speed at which the Axis will move for Pan/Tilt (0-100)
CAMERA_MOVE_SPEED=99
# How many seconds after issuing a Pan/Tilt command should a picture be taken
CAMERA_DELAY=0.5
# The zoom setting for the camera (0-9999)
CAMERA_ZOOM=9999
# How many seconds ahead of a plane's predicted location should the camera be positioned
CAMERA_LEAD=0.25

# The device ID for the RTL-SDR - set using the rtl_eeprom program
RTL_DEV=1

# The docker image versions to use
RELEASE_NAME=v2.1

0 comments on commit 8174703

Please sign in to comment.