Merge branch 'release-0.11.0' of https://github.com/blakeblackshear/frigate into camera-level-birdseye

docker-compose.yml

@@ -5,9 +5,9 @@ services:
     user: vscode
     # add groups from host for render, plugdev, video
     group_add:
-      - 109 # render
-      - 44  # video
-      - 46  # plugdev
+      - "109" # render
+      - "44"  # video
+      - "46"  # plugdev
     shm_size: "256mb"
     build:
       context: .

docker/Dockerfile

@@ -38,27 +38,11 @@ RUN apt-get -qq update \
 RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
     && python3 get-pip.py "pip"
 
-RUN pip3 install scikit-build
+COPY requirements.txt /requirements.txt
+RUN pip3 install -r requirements.txt
 
-# TODO: lock with requirements.txt
-RUN pip3 wheel --wheel-dir=/wheels \
-    opencv-python-headless \
-    numpy \
-    imutils \
-    scipy \
-    psutil \
-    Flask \
-    paho-mqtt \
-    PyYAML \
-    matplotlib \
-    click \
-    setproctitle \
-    peewee \
-    peewee_migrate \
-    pydantic \
-    zeroconf \
-    ws4py \
-    requests
+COPY requirements-wheels.txt /requirements-wheels.txt
+RUN pip3 wheel --wheel-dir=/wheels -r requirements-wheels.txt 
 
 # Frigate Container
 FROM debian:11-slim

docker/Dockerfile.dev

@@ -17,7 +17,8 @@ RUN groupadd --gid $USER_GID $USERNAME \
 RUN apt-get update \
     && apt-get install -y git curl vim htop
 
-RUN pip3 install pylint black
+COPY requirements-dev.txt /opt/frigate/requirements-dev.txt
+RUN pip3 install -r requirements-dev.txt
 
 # Install Node 16
 RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \

requirements-dev.txt

@@ -0,0 +1,2 @@
+pylint == 2.13.*
+black == 22.3.*

requirements-wheels.txt

@@ -0,0 +1,17 @@
+click == 8.1.*
+Flask == 2.1.*
+imutils == 0.5.*
+matplotlib == 3.5.*
+numpy == 1.22.*
+opencv-python-headless == 4.5.5.*
+paho-mqtt == 1.6.*
+peewee == 3.14.*
+peewee_migrate == 1.4.*
+psutil == 5.9.*
+pydantic == 1.9.*
+PyYAML == 6.0.*
+requests == 2.27.*
+scipy == 1.8.*
+setproctitle == 1.2.*
+ws4py == 0.5.*
+zeroconf == 0.38.4

requirements.txt

@@ -0,0 +1 @@
+scikit-build == 0.14.1