Skip to content

Commit

Permalink
Simplify deploy and rename .yml -> .yaml for consistency.
Browse files Browse the repository at this point in the history
In models.py update the on_delete constraint in region
for frame deletion to null. Further simplify deployment.

Soon:

- YFCC processing and preparation scripts to VDN.

- Export trained approximators as zip file.

Next:

- Implement pre-condition checks, failed to launch error
messages for processes. Rollback created models on failure to launch.

- Add location net, fine-tuning / training face recognition models
  • Loading branch information
akshay bhat committed Jun 17, 2018
1 parent b5aa6bd commit 6bd0fe7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
15 changes: 5 additions & 10 deletions deploy/compose/docker-compose-cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,18 @@
- LAUNCH_Q_qtrainer=1
- LAUNCH_Q_qstreamer=1
- LAUNCH_SCHEDULER=1
- LAUNCH_SERVER=1 # This supersedes NGINX and launches django development server with auto-reload
- LAUNCH_NOTEBOOK=1 # Run a jupyter notebook server inside the container to enable easy debugging
- ENABLE_DEBUG=1 # Enables django debug mode
command: bash -c "cd /root/DVA/repos/tf_ctpn_cpu/lib/utils/ && ./make.sh && cd /root/DVA/server/ && sleep 10 && ./start_container.py"
command: bash -c "git reset --hard && git pull && sleep 10 && ./start_container.py"
ports:
- "127.0.0.1:8000:80"
- "127.0.0.1:8889:8888"
- "127.0.0.1:8000:80" # Since Docker messes up iptables, ufw has no effect as a result bind to localhost and tunnel / Port forward through SSH
- "127.0.0.1:8889:8888" # Since Docker messes up iptables, ufw has no effect as a result bind to localhost and tunnel / Port forward through SSH
depends_on:
- db
- rabbit
- redis
volumes:
- ../../:/root/DVA/
- ../../configs/custom_defaults:/root/DVA/configs/custom_defaults
tmpfs:
- /root/media
- dvadata:/root/media
volumes:
dvapgdata:
dvadata:
dvarabbit:
dvaredis:
17 changes: 11 additions & 6 deletions deploy/compose/docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,26 @@
- LAUNCH_BY_NAME_detector_face=1
- LAUNCH_BY_NAME_detector_textbox=1
- LAUNCH_Q_qextract=1
- LAUNCH_Q_qstreamer=1
- LAUNCH_Q_qtrainer=1
- LAUNCH_Q_qstreamer=1
- LAUNCH_SCHEDULER=1
command: bash -c "git reset --hard && git pull && sleep 10 && ./start_container.py"
- LAUNCH_SERVER=1 # This supersedes NGINX and launches django development server with auto-reload
- LAUNCH_NOTEBOOK=1 # Run a jupyter notebook server inside the container to enable easy debugging
- ENABLE_DEBUG=1 # Enables django debug mode
command: bash -c "cd /root/DVA/repos/tf_ctpn_cpu/lib/utils/ && ./make.sh && cd /root/DVA/server/ && sleep 10 && ./start_container.py"
ports:
- "127.0.0.1:8000:80" # Since Docker messes up iptables, ufw has no effect as a result bind to localhost and tunnel / Port forward through SSH
- "127.0.0.1:8889:8888" # Since Docker messes up iptables, ufw has no effect as a result bind to localhost and tunnel / Port forward through SSH
- "127.0.0.1:8000:80"
- "127.0.0.1:8889:8888"
depends_on:
- db
- rabbit
- redis
volumes:
- dvadata:/root/media
- ../../:/root/DVA/
- ../../configs/custom_defaults:/root/DVA/configs/custom_defaults
tmpfs:
- /root/media
volumes:
dvapgdata:
dvadata:
dvarabbit:
dvaredis:

0 comments on commit 6bd0fe7

Please sign in to comment.