From 6cb369f19bf4eaf29c9b04e9ca59c1f3230f48dc Mon Sep 17 00:00:00 2001
From: MarcA711 <>
Date: Tue, 31 Oct 2023 17:49:53 +0000
Subject: [PATCH] adjust targets

---
 docker/rockchip/Dockerfile | 11 ++++++++---
 docker/rockchip/rk.hcl     | 13 ++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/docker/rockchip/Dockerfile b/docker/rockchip/Dockerfile
index 69b8b9626..3d0fffbc5 100644
--- a/docker/rockchip/Dockerfile
+++ b/docker/rockchip/Dockerfile
@@ -9,11 +9,16 @@ COPY docker/rockchip/requirements-wheels-rk.txt /requirements-wheels-rk.txt
 RUN sed -i "/https/d" /requirements-wheels.txt
 RUN pip3 wheel --wheel-dir=/rk-wheels -c /requirements-wheels.txt -r /requirements-wheels-rk.txt
 
-FROM wget as rk-deps
+FROM wget as rk-libs
 RUN wget -qO librknnrt.so https://github.com/MarcA711/rknpu2/raw/master/runtime/RK3588/Linux/librknn_api/aarch64/librknnrt.so
 
-FROM frigate as frigate-rk
+FROM deps AS rk-deps
+ARG TARGETARCH
+
 RUN --mount=type=bind,from=rk-wheels,source=/rk-wheels,target=/deps/rk-wheels \ 
     pip3 install -U /deps/rk-wheels/*.whl 
-COPY --from=rk-deps /rootfs/librknnrt.so /usr/lib/
+
+WORKDIR /opt/frigate/
+COPY --from=rootfs / /
+COPY --from=rk-libs /rootfs/librknnrt.so /usr/lib/
 COPY docker/rockchip/yolov8n-320x320.rknn /models/
\ No newline at end of file
diff --git a/docker/rockchip/rk.hcl b/docker/rockchip/rk.hcl
index 8123b7749..513fefa25 100644
--- a/docker/rockchip/rk.hcl
+++ b/docker/rockchip/rk.hcl
@@ -10,10 +10,16 @@ target wheels {
   target = "wheels"
 }
 
-target frigate {
+target deps {
   dockerfile = "docker/main/Dockerfile"
   platforms = ["linux/arm64"]
-  target = "frigate"
+  target = "deps"
+}
+
+target rootfs {
+  dockerfile = "docker/main/Dockerfile"
+  platforms = ["linux/arm64"]
+  target = "rootfs"
 }
 
 target rk {
@@ -21,7 +27,8 @@ target rk {
   contexts = {
     wget = "target:wget",
     wheels = "target:wheels",
-    frigate = "target:frigate"
+    deps = "target:deps",
+    rootfs = "target:rootfs"
   }
   platforms = ["linux/arm64"]
 }
\ No newline at end of file