From 1cd76ca5e5f11ef5277b59a53e24d5a7d6cec908 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Tue, 18 Jul 2023 06:13:58 -0600 Subject: [PATCH] Move requirements files and set intermediate targets --- .github/workflows/pull_request.yml | 2 +- docker/main/Dockerfile | 8 ++++---- requirements-dev.txt => docker/main/requirements-dev.txt | 0 requirements-ov.txt => docker/main/requirements-ov.txt | 0 .../main/requirements-wheels.txt | 0 requirements.txt => docker/main/requirements.txt | 0 docker/rpi/rpi.hcl | 6 ++++-- docker/tensorrt/Dockerfile | 2 +- .../tensorrt/requirements.txt | 0 docker/tensorrt/trt.hcl | 8 +++++++- 10 files changed, 17 insertions(+), 9 deletions(-) rename requirements-dev.txt => docker/main/requirements-dev.txt (100%) rename requirements-ov.txt => docker/main/requirements-ov.txt (100%) rename requirements-wheels.txt => docker/main/requirements-wheels.txt (100%) rename requirements.txt => docker/main/requirements.txt (100%) rename requirements-tensorrt.txt => docker/tensorrt/requirements.txt (100%) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7e97cfb6c..3b094ca90 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -71,7 +71,7 @@ jobs: - name: Install requirements run: | python3 -m pip install -U pip - python3 -m pip install -r requirements-dev.txt + python3 -m pip install -r docker/main/requirements-dev.txt - name: Check black run: | black --check --diff frigate migrations docker *.py diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 029abbc35..06bc71c06 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -47,7 +47,7 @@ FROM base_amd64 AS ov-converter ARG DEBIAN_FRONTEND # Install OpenVino Runtime and Dev library -COPY requirements-ov.txt /requirements-ov.txt +COPY docker/main/requirements-ov.txt /requirements-ov.txt RUN apt-get -qq update \ && apt-get -qq install -y wget python3 python3-distutils \ && wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \ @@ -140,10 +140,10 @@ RUN apt-get -qq update \ RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \ && python3 get-pip.py "pip" -COPY requirements.txt /requirements.txt +COPY docker/main/requirements.txt /requirements.txt RUN pip3 install -r requirements.txt -COPY requirements-wheels.txt /requirements-wheels.txt +COPY docker/main/requirements-wheels.txt /requirements-wheels.txt RUN pip3 wheel --wheel-dir=/wheels -r requirements-wheels.txt @@ -218,7 +218,7 @@ RUN apt-get update \ && apt-get install make -y \ && rm -rf /var/lib/apt/lists/* -RUN --mount=type=bind,source=./requirements-dev.txt,target=/workspace/frigate/requirements-dev.txt \ +RUN --mount=type=bind,source=./docker/main/requirements-dev.txt,target=/workspace/frigate/requirements-dev.txt \ pip3 install -r requirements-dev.txt CMD ["sleep", "infinity"] diff --git a/requirements-dev.txt b/docker/main/requirements-dev.txt similarity index 100% rename from requirements-dev.txt rename to docker/main/requirements-dev.txt diff --git a/requirements-ov.txt b/docker/main/requirements-ov.txt similarity index 100% rename from requirements-ov.txt rename to docker/main/requirements-ov.txt diff --git a/requirements-wheels.txt b/docker/main/requirements-wheels.txt similarity index 100% rename from requirements-wheels.txt rename to docker/main/requirements-wheels.txt diff --git a/requirements.txt b/docker/main/requirements.txt similarity index 100% rename from requirements.txt rename to docker/main/requirements.txt diff --git a/docker/rpi/rpi.hcl b/docker/rpi/rpi.hcl index ad673ce52..66f97c16d 100644 --- a/docker/rpi/rpi.hcl +++ b/docker/rpi/rpi.hcl @@ -1,14 +1,16 @@ -target "deps" { +target deps { dockerfile = "docker/main/Dockerfile" platforms = ["linux/arm64"] + target = "deps" } target rootfs { dockerfile = "docker/main/Dockerfile" platforms = ["linux/arm64"] + target = "rootfs" } -target "rpi" { +target rpi { dockerfile = "docker/rpi/Dockerfile" contexts = { deps = "target:deps", diff --git a/docker/tensorrt/Dockerfile b/docker/tensorrt/Dockerfile index f5e8be54e..564cc3b5b 100644 --- a/docker/tensorrt/Dockerfile +++ b/docker/tensorrt/Dockerfile @@ -9,7 +9,7 @@ ARG DEBIAN_FRONTEND ARG TARGETARCH # Add TensorRT wheels to another folder -COPY requirements-tensorrt.txt /requirements-tensorrt.txt +COPY docker/tensorrt/requirements.txt /requirements-tensorrt.txt RUN mkdir -p /trt-wheels && pip3 wheel --wheel-dir=/trt-wheels -r /requirements-tensorrt.txt # Build TensorRT-specific library diff --git a/requirements-tensorrt.txt b/docker/tensorrt/requirements.txt similarity index 100% rename from requirements-tensorrt.txt rename to docker/tensorrt/requirements.txt diff --git a/docker/tensorrt/trt.hcl b/docker/tensorrt/trt.hcl index 64141542e..589d0b73b 100644 --- a/docker/tensorrt/trt.hcl +++ b/docker/tensorrt/trt.hcl @@ -1,21 +1,25 @@ target deps { dockerfile = "docker/main/Dockerfile" platforms = ["linux/amd64"] + target = "deps" } target rootfs { dockerfile = "docker/main/Dockerfile" platforms = ["linux/amd64"] + target = "rootfs" } target wheels { dockerfile = "docker/main/Dockerfile" platforms = ["linux/amd64"] + target = "wheels" } target devcontainer { dockerfile = "docker/main/Dockerfile" platforms = ["linux/amd64"] + target = "devcontainer" } target tensorrt { @@ -27,6 +31,7 @@ target tensorrt { wheels = "target:wheels" } platforms = ["linux/amd64"] + target = "frigate-tensorrt" } target devcontainer-trt { @@ -36,7 +41,8 @@ target devcontainer-trt { deps = "target:deps", rootfs = "target:rootfs" wheels = "target:wheels" - devcontainer = "target:devcontainer + devcontainer = "target:devcontainer" } platforms = ["linux/amd64"] + target = "devcontainer-trt" } \ No newline at end of file