From c1490494a653c6b984601d2a7744d8ed319b2c53 Mon Sep 17 00:00:00 2001 From: MarcA711 <40744649+MarcA711@users.noreply.github.com> Date: Sun, 18 Feb 2024 20:15:51 +0000 Subject: [PATCH] update build files --- docker/rockchip/Dockerfile | 6 +++--- docker/rockchip/rk.hcl | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docker/rockchip/Dockerfile b/docker/rockchip/Dockerfile index b27e4f223..65e712b71 100644 --- a/docker/rockchip/Dockerfile +++ b/docker/rockchip/Dockerfile @@ -9,7 +9,7 @@ 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 deps AS rk-deps +FROM deps AS rk-frigate ARG TARGETARCH RUN --mount=type=bind,from=rk-wheels,source=/rk-wheels,target=/deps/rk-wheels \ @@ -28,5 +28,5 @@ ADD https://github.com/MarcA711/rknn-models/releases/download/v1.5.2-rk3588/yolo RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffmpeg RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffprobe -ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.0-1/ffmpeg /usr/lib/btbn-ffmpeg/bin/ -ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.0-1/ffprobe /usr/lib/btbn-ffmpeg/bin/ +ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-1/ffmpeg /usr/lib/btbn-ffmpeg/bin/ +ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-1/ffprobe /usr/lib/btbn-ffmpeg/bin/ diff --git a/docker/rockchip/rk.hcl b/docker/rockchip/rk.hcl index 513fefa25..9424b46e7 100644 --- a/docker/rockchip/rk.hcl +++ b/docker/rockchip/rk.hcl @@ -1,9 +1,3 @@ -target wget { - dockerfile = "docker/main/Dockerfile" - platforms = ["linux/arm64"] - target = "wget" -} - target wheels { dockerfile = "docker/main/Dockerfile" platforms = ["linux/arm64"] @@ -25,7 +19,6 @@ target rootfs { target rk { dockerfile = "docker/rockchip/Dockerfile" contexts = { - wget = "target:wget", wheels = "target:wheels", deps = "target:deps", rootfs = "target:rootfs"