Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates to camera file structure to allow for edge detection capability #39

Merged
merged 3 commits into from
Jan 10, 2023
Merged

Updates to camera file structure to allow for edge detection capability #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d70508b
Updates to allow for flat file saving
meadej Dec 15, 2022
383c833
Updated build file
meadej Dec 22, 2022
6035696
Set default values for camera file structure
meadej Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Set default values for camera file structure
  • Loading branch information
@meadej
meadej committed Jan 10, 2023
commit 60356967ed917814a9d55158b376129365c5bf9f
5 changes: 2 additions & 3 deletions .github/workflows/dockerbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
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"
DOCKERUSERNAME: ${{ secrets.DOCKER_USERNAME }}
PROJECT_NAME: "skyscan"
run: |
IFS=","
Expand All @@ -53,7 +52,7 @@ jobs:
echo "Building $folder"
echo $SUBNAME
docker buildx build "$folder" --push \
--tag $DOCKERUSERNAME/$PROJECT_NAME-$SUBNAME:latest \
--tag $DOCKERUSERNAME/$PROJECT_NAME-$SUBNAME:${{ steps.get_tag.outputs.IMAGE_TAG }} \
--tag iqtlabs/$PROJECT_NAME-$SUBNAME:latest \
--tag iqtlabs/$PROJECT_NAME-$SUBNAME:${{ steps.get_tag.outputs.IMAGE_TAG }} \
--platform linux/arm64,linux/amd64
done
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:

axis-ptz:
image: iqtlabs/skyscan-axis-ptz
command: "./camera.py -f -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}"
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:
- /flash/raw:/app/capture
depends_on:
Expand Down