AETHER-2274 Containerize person-detection-app
Change-Id: Ifc8acc31ed2d62df1c7f33d402a260132766c955
diff --git a/Makefile b/Makefile
index e4ca58d..621e522 100644
--- a/Makefile
+++ b/Makefile
@@ -45,16 +45,16 @@
docker run -itu root:root --privileged --network host --name $(IMAGE) --rm $(IMAGE)
run-native-test:
- . ./person_detection.sh -i ./resources/run.mp4
+ . ./bin/person_detection.sh -i ./resources/run.mp4
run-native:
- . ./person_detection.sh -i gstreamer
+ . ./bin/person_detection.sh -i gstreamer
run-native-test-no-show:
- . ./person_detection.sh -i ./resources/run.mp4 -ns
+ . ./bin/person_detection.sh -i ./resources/run.mp4 -ns
run-native-no-show:
- . ./person_detection.sh -i gstreamer -ns
+ . ./bin/person_detection.sh -i gstreamer -ns
test:
diff --git a/README.md b/README.md
index 94e9c2a..376dcda 100644
--- a/README.md
+++ b/README.md
@@ -23,3 +23,12 @@
```
make run
```
+
+## Quick test
+```
+./bin/person_detection.sh -i resources/run.mp4
+```
+or
+```
+make run-native-test
+```
diff --git a/bin/person_detection.sh b/bin/person_detection.sh
new file mode 100755
index 0000000..ed46c62
--- /dev/null
+++ b/bin/person_detection.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+args="$@"
+source .venv/bin/activate
+source /opt/intel/openvino/bin/setupvars.sh
+python3 person_detection/person_detection.py -d CPU -m resources/models/intel/person-detection-retail-0013/FP32/person-detection-retail-0013.xml $args
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6fcc485..90848e6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,6 @@
#python3 docker_openvino.py build -d cpu -os ubuntu18 --distribution runtime --product_version 2021.4
-FROM ubuntu18_runtime:2021.4
+#FROM ubuntu18_runtime:2021.4
+FROM openvino/ubuntu18_runtime
USER root
@@ -23,5 +24,5 @@
RUN . .venv/bin/activate && \
pip3 install -r requirements.txt
-ENTRYPOINT ["./person_detection.sh"]
+ENTRYPOINT ["./bin/person_detection.sh"]
CMD ["-i gstreamer", "-ns"]
diff --git a/person_detection.sh b/person_detection.sh
deleted file mode 100755
index a58351c..0000000
--- a/person_detection.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-args="$@"
-source .venv/bin/activate
-source /opt/intel/openvino/bin/setupvars.sh
-python3 person_detection/person_detection.py -d CPU -m ./resources/models/intel/person-detection-retail-0013/FP32/person-detection-retail-0013.xml $args