Skip to content

Commit 9fcb88d

Browse files
vangjvangj
committed
make it like a real exe
1 parent 796b250 commit 9fcb88d

File tree

4 files changed

+25
-24
lines changed

4 files changed

+25
-24
lines changed

‎dl-darknet/DOCKERHUB.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docker run -it \
2323
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
2424
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
2525
oneoffcoder/dl-darknet \
26-
/bin/sh -c "cd /darknet; ./darknet detector test cfg/coco.data cfg/yolov3-tiny.cfg weight/yolov3-tiny.weights data/dog.jpg -dont_show > image/dog.log"
26+
detector test cfg/coco.data cfg/yolov3-tiny.cfg weight/yolov3-tiny.weights data/dog.jpg -dont_show > image/dog.log
2727
```
2828

2929
Detection with normal weights.
@@ -41,7 +41,7 @@ docker run -it \
4141
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
4242
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
4343
oneoffcoder/dl-darknet \
44-
/bin/sh -c 'cd /darknet; ./darknet detector test cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights data/dog.jpg -dont_show'
44+
detector test cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights data/dog.jpg -dont_show
4545
```
4646

4747
Detection on a MP4 file.
@@ -59,7 +59,7 @@ docker run -it \
5959
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
6060
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
6161
oneoffcoder/dl-darknet \
62-
/bin/sh -c 'cd /darknet; ./darknet detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -out_filename video/dummy.avi -dont_show'
62+
detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -out_filename video/dummy.avi -dont_show
6363
```
6464

6565
Detection on a MP4 file and output to JSON + MJPEG + AVI. After you run the command below, direct your browsers to the following URLs.
@@ -82,7 +82,7 @@ docker run -it \
8282
-p 8070:8070 \
8383
-p 8090:8090 \
8484
oneoffcoder/dl-darknet \
85-
/bin/sh -c 'cd /darknet; ./darknet detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi'
85+
etector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi
8686
```
8787

8888
Detection on a real-time video stream and redirect output to JSON + MJPEG + AVIG. Note that you can test the below by downloading and installing [IP Webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) on your phone; replace the IP below with the one on your phone (the software on the phone will show you what the phone's IP is).
@@ -102,7 +102,7 @@ docker run -it \
102102
-p 8070:8070 \
103103
-p 8090:8090 \
104104
oneoffcoder/dl-darknet \
105-
/bin/sh -c 'cd /darknet; ./darknet detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights http://192.168.0.210:8080/video?dummy=param.mjpg -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi'
105+
detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights http://192.168.0.210:8080/video?dummy=param.mjpg -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi
106106
```
107107

108108
Training your own object detector.
@@ -120,7 +120,7 @@ docker run -it \
120120
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
121121
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
122122
oneoffcoder/dl-darknet \
123-
/bin/sh -c 'cd /darknet; ./darknet detector train /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg -dont_show'
123+
detector train /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg -dont_show
124124
```
125125

126126
Testing your own object detector.
@@ -138,7 +138,7 @@ docker run -it \
138138
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
139139
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
140140
oneoffcoder/dl-darknet \
141-
/bin/sh -c 'cd /darknet; ./darknet detector test /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg /darknet/backup/tiny-yolo-iaia-polygons_last.weights -ext_output -dont_show -out /darknet/log/result.json < /darknet/image/polygons/iaia-polygons_valid.txt'
141+
detector test /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg /darknet/backup/tiny-yolo-iaia-polygons_last.weights -ext_output -dont_show -out /darknet/log/result.json < /darknet/image/polygons/iaia-polygons_valid.txt
142142
```
143143

144144
Annotating the images with the results.
@@ -155,6 +155,7 @@ docker run -it \
155155
-v $HOME/git/docker-containers/dl-darknet/log:/darknet/log \
156156
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
157157
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
158+
--entrypoint /opt/anaconda/bin/python \
158159
oneoffcoder/dl-darknet \
159-
/bin/sh -c '/opt/anaconda/bin/python /root/scripts/annotate.py -j /darknet/log/result.json -d /darknet/image/polygons/annotations'
160+
/root/scripts/annotate.py -j /darknet/log/result.json -d /darknet/image/polygons/annotations
160161
```

‎dl-darknet/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ COPY setup.sh /tmp/setup.sh
55
RUN /tmp/setup.sh
66
RUN rm -f /tmp/setup.sh
77
EXPOSE 8888 8070 8090
8-
VOLUME ["/darknet/cfg", "/darknet/data", "/darknet/weight", "/darknet/video", "/darknet/image", "/darknet/log", "/darknet/backup", "/root/scripts"]
8+
VOLUME ["/darknet/cfg", "/darknet/data", "/darknet/weight", "/darknet/video", "/darknet/image", "/darknet/log", "/darknet/backup", "/root/scripts"]
9+
WORKDIR /darknet
10+
ENTRYPOINT [ "./darknet" ]
11+
CMD [ "" ]

‎dl-darknet/README.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docker run -it \
2323
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
2424
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
2525
dl-darknet:local \
26-
/bin/sh -c "cd /darknet; ./darknet detector test cfg/coco.data cfg/yolov3-tiny.cfg weight/yolov3-tiny.weights data/dog.jpg -dont_show > image/dog.log"
26+
detector test cfg/coco.data cfg/yolov3-tiny.cfg weight/yolov3-tiny.weights data/dog.jpg -dont_show > image/dog.log
2727
```
2828

2929
Detection with normal weights.
@@ -41,7 +41,7 @@ docker run -it \
4141
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
4242
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
4343
dl-darknet:local \
44-
/bin/sh -c 'cd /darknet; ./darknet detector test cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights data/dog.jpg -dont_show'
44+
detector test cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights data/dog.jpg -dont_show > image/dog2.log
4545
```
4646

4747
Detection on a MP4 file.
@@ -59,7 +59,7 @@ docker run -it \
5959
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
6060
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
6161
dl-darknet:local \
62-
/bin/sh -c 'cd /darknet; ./darknet detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -out_filename video/dummy.avi -dont_show'
62+
detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -out_filename video/dummy.avi -dont_show
6363
```
6464

6565
Detection on a MP4 file and output to JSON + MJPEG + AVI. After you run the command below, direct your browsers to the following URLs.
@@ -82,7 +82,7 @@ docker run -it \
8282
-p 8070:8070 \
8383
-p 8090:8090 \
8484
dl-darknet:local \
85-
/bin/sh -c 'cd /darknet; ./darknet detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi'
85+
detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights video/dummy.mp4 -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi
8686
```
8787

8888
Detection on a real-time video stream and redirect output to JSON + MJPEG + AVIG. Note that you can test the below by downloading and installing [IP Webcam](https://play.google.com/store/apps/details?id=com.pas.webcam) on your phone; replace the IP below with the one on your phone (the software on the phone will show you what the phone's IP is).
@@ -102,7 +102,7 @@ docker run -it \
102102
-p 8070:8070 \
103103
-p 8090:8090 \
104104
dl-darknet:local \
105-
/bin/sh -c 'cd /darknet; ./darknet detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights http://192.168.0.210:8080/video?dummy=param.mjpg -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi'
105+
detector demo cfg/coco.data cfg/yolov3.cfg weight/yolov3.weights http://192.168.0.210:8080/video?dummy=param.mjpg -json_port 8070 -mjpeg_port 8090 -ext_output -dont_show -out_filename video/dummy.avi
106106
```
107107

108108
Training your own object detector.
@@ -120,7 +120,7 @@ docker run -it \
120120
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
121121
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
122122
dl-darknet:local \
123-
/bin/sh -c 'cd /darknet; ./darknet detector train /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg -dont_show'
123+
detector train /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg -dont_show
124124
```
125125

126126
Testing your own object detector.
@@ -138,7 +138,7 @@ docker run -it \
138138
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
139139
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
140140
dl-darknet:local \
141-
/bin/sh -c 'cd /darknet; ./darknet detector test /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg /darknet/backup/tiny-yolo-iaia-polygons_last.weights -ext_output -dont_show -out /darknet/log/result.json < /darknet/image/polygons/iaia-polygons_valid.txt'
141+
detector test /darknet/image/polygons/iaia-polygons.data /darknet/image/polygons/tiny-yolo-iaia-polygons.cfg /darknet/backup/tiny-yolo-iaia-polygons_last.weights -ext_output -dont_show -out /darknet/log/result.json < /darknet/image/polygons/iaia-polygons_valid.txt
142142
```
143143

144144
Annotating the images with the results.
@@ -155,8 +155,9 @@ docker run -it \
155155
-v $HOME/git/docker-containers/dl-darknet/log:/darknet/log \
156156
-v $HOME/git/docker-containers/dl-darknet/backup:/darknet/backup \
157157
-v $HOME/git/docker-containers/dl-darknet/scripts:/root/scripts \
158+
--entrypoint /opt/anaconda/bin/python \
158159
dl-darknet:local \
159-
/bin/sh -c '/opt/anaconda/bin/python /root/scripts/annotate.py -j /darknet/log/result.json -d /darknet/image/polygons/annotations'
160+
/root/scripts/annotate.py -j /darknet/log/result.json -d /darknet/image/polygons/annotations
160161
```
161162

162163
# Use in interactive terminal mode
@@ -168,6 +169,7 @@ docker run -it \
168169
--runtime=nvidia \
169170
--shm-size=5g \
170171
-e NVIDIA_VISIBLE_DEVICES=0 \
172+
--entrypoint /bin/bash \
171173
dl-darknet:local
172174
```
173175

@@ -224,9 +226,4 @@ journal={GitHub},
224226
author={One-Off Coder},
225227
year={2019},
226228
month={Jul}}
227-
```
228-
229-
# TODO's
230-
231-
* [Use ENTRYPOINT and CMD](https://medium.com/@oprearocks/how-to-properly-override-the-entrypoint-using-docker-run-2e081e5feb9d)
232-
* [Use WORKDIR](https://stackoverflow.com/questions/20632258/change-directory-command-in-docker)
229+
```

‎dl-darknet/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ORGANIZATION=oneoffcoder
44
REPOSITORY=dl-darknet
5-
VERSION=0.0.2
5+
VERSION=0.0.3
66
IMAGEID=$(docker images | awk -v repo="$REPOSITORY" -v tag="local" 'index($1, repo) && index($2, tag) {print $3}')
77

88
echo ${IMAGEID}

0 commit comments

Comments
 (0)