From 6e1ba254861cb17ee1a5f6f0f63951df62f6b42c Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Thu, 17 Nov 2022 07:31:20 -0700 Subject: [PATCH] Cleanup dockerfile --- docker/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 267cd7a6b..b5e08b64b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -132,16 +132,16 @@ RUN wget -q https://github.com/google-coral/test_data/raw/release-frogfish/ssdli RUN wget -q https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess.tflite -O /cpu_model.tflite # setup rockchip support -RUN mkdir rockchip +COPY precompiled_models/ precompiled_models/ -RUN ROCK_ARCH="${TARGETARCH}" \ +RUN mkdir rockchip \ + && ROCK_ARCH="${TARGETARCH}" \ && if [ "${TARGETARCH}" = "amd64" ]; then ROCK_ARCH="x86_64"; fi \ && if [ "${TARGETARCH}" = "arm" ]; then ROCK_ARCH="aarch64"; fi \ && if [ "${TARGETARCH}" = "arm64" ]; then ROCK_ARCH="aarch64"; fi \ && wget -q "https://repo.rock-chips.com/edge/pypi/simple/rknn-toolkit-lite/rknn_toolkit_lite-1.7.2.dev12139523-cp39-cp39-linux_${ROCK_ARCH}.whl" -O rockchip/rknn_toolkit_lite-1.7.2.dev12139523-cp39-cp39-linux_${ROCK_ARCH}.whl \ - && python3 -m pip install rockchip/rknn_toolkit_lite-1.7.2.dev12139523-cp39-cp39-linux_${ROCK_ARCH}.whl --no-deps - -COPY precompiled_models/ precompiled_models/ + && python3 -m pip install rockchip/rknn_toolkit_lite-1.7.2.dev12139523-cp39-cp39-linux_${ROCK_ARCH}.whl --no-deps \ + && mv precompiled_models/* models/ WORKDIR /opt/frigate/ ADD frigate frigate/