diff --git a/openvino/Dockerfile b/openvino/Dockerfile index eb392d3..8d957da 100644 --- a/openvino/Dockerfile +++ b/openvino/Dockerfile @@ -32,7 +32,7 @@ MAINTAINER qi.zheng@intel.com COPY --from=builder /install_root / -WORKDIR /work +WORKDIR /app # path to save pre-downloaded models ENV MODEL_DIR="/models" @@ -42,20 +42,20 @@ ENV MO_PATH="/usr/share/openvino/model-optimizer/mo.py" # If not pre-downloaded, the entrypoint will try download it and set the MODEL_PATH # ENVs values could be passed by users to dynamically choose model to be used ENV MODEL_NAME="face-detection-retail-0005" -ENV MODEL_PRECISION="INT8" +ENV MODEL_PRECISION="FP32" # pre-downloaded and converted models for openvino -COPY ./models.txt /work -RUN for m in $(cat /work/models.txt); do \ +COPY ./models.txt /app +RUN for m in $(cat /app/models.txt); do \ model-downloader --name $m -o $MODEL_DIR && \ model-converter --name $m -d $MODEL_DIR -o $MODEL_DIR --mo $MO_PATH; \ done # Pre-install some python libs for serivce to use -COPY ./requirements.txt /work -RUN pip3 install -r requirements.txt +COPY ./requirements.txt /app +RUN pip3 install -r /app/requirements.txt -COPY ./set_model_path.sh /work +COPY ./set_model_path.sh /app COPY docker-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/docker-entrypoint.sh ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/openvino/classification.yaml b/openvino/classification.yaml index a693144..54b80a4 100644 --- a/openvino/classification.yaml +++ b/openvino/classification.yaml @@ -57,7 +57,7 @@ spec: - containerPort: 5000 volumeMounts: - name: server-py - mountPath: /work/app.py + mountPath: /app/app.py subPath: app.py volumes: - name: server-py diff --git a/openvino/docker-compose-server.yml b/openvino/docker-compose-server.yml index 1875763..17fbd00 100644 --- a/openvino/docker-compose-server.yml +++ b/openvino/docker-compose-server.yml @@ -11,6 +11,6 @@ services: ports: - "5000:5000" volumes: - - "./app.py:/work/app.py" + - "./app.py:/app/app.py" command: "python3 app.py" diff --git a/openvino/docker-compose.yml b/openvino/docker-compose.yml index 13c37f7..bb956f0 100644 --- a/openvino/docker-compose.yml +++ b/openvino/docker-compose.yml @@ -9,7 +9,7 @@ services: MODEL_NAME: alexnet MODEL_PRECISION: FP32 volumes: - - "./cat.bmp:/work/cat.bmp" - - "./demo.sh:/work/demo.sh" - command: "/work/demo.sh" + - "./cat.bmp:/app/cat.bmp" + - "./demo.sh:/app/demo.sh" + command: "/app/demo.sh" diff --git a/openvino/docker-entrypoint.sh b/openvino/docker-entrypoint.sh index 335499e..b358651 100755 --- a/openvino/docker-entrypoint.sh +++ b/openvino/docker-entrypoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash -source /work/set_model_path.sh +source /app/set_model_path.sh echo "MODEL NAME: $MODEL_NAME" echo "MODEL PRECISION: $MODEL_PRECISION" diff --git a/openvino/models.txt b/openvino/models.txt index a11dfbc..24cd9e8 100644 --- a/openvino/models.txt +++ b/openvino/models.txt @@ -1,5 +1,4 @@ face-detection-retail-0005 facial-landmarks-35-adas -mobilenet-ssd person-vehicle-bike-detection-crossroad-0078 person-detection-retail-0013