diff --git a/docker/Dockerfile b/docker/Dockerfile index 622da1432..cd755aaf7 100644 --- a/docker/Dockerfile +++ b/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 diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index a65070d8c..7f47c3768 100644 --- a/docker/Dockerfile.dev +++ b/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 - \ diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 000000000..5cba885d9 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,2 @@ +pylint == 2.13.* +black == 22.3.* diff --git a/requirements-wheels.txt b/requirements-wheels.txt new file mode 100644 index 000000000..a817c318c --- /dev/null +++ b/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 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..d3679d115 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +scikit-build == 0.14.1