diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 617176f8f..968b17b05 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -155,6 +155,8 @@ RUN PIP_IGNORE_INSTALLED=0 pip3 install -r /requirements.txt RUN PIP_IGNORE_INSTALLED=0 pip3 install --no-deps filterpy norfair==2.1.1 +RUN PIP_IGNORE_INSTALLED=0 pip3 install --no-deps onvif + RUN PIP_IGNORE_INSTALLED=0 pip3 install --no-deps zeep==3.0.0 onvif_zeep COPY docker/main/requirements-wheels.txt /requirements-wheels.txt @@ -191,6 +193,8 @@ RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_de COPY --from=wheels /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages COPY --from=wheels /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages +COPY --from=wheels /usr/share/matplotlib /usr/share/matplotlib +COPY --from=wheels /etc/matplotlibrc /etc/matplotlibrc RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \ python3 -m pip install --upgrade pip && \ diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh index 1ede14b57..69e8e7c60 100755 --- a/docker/main/install_deps.sh +++ b/docker/main/install_deps.sh @@ -14,7 +14,10 @@ apt-get -qq install --no-install-recommends -y \ python3-pip \ curl \ jq \ - nethogs + nethogs \ + libopencv-*4.5 +# libopencv-core4.5 libopencv-contrib4.5 libopencv-shape4.5 libopencv-stitching4.5 + # ensure python3 defaults to python3.9 update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1 diff --git a/frigate/comms/detections_updater.py b/frigate/comms/detections_updater.py index 37da1586e..d6129a609 100644 --- a/frigate/comms/detections_updater.py +++ b/frigate/comms/detections_updater.py @@ -19,7 +19,7 @@ class DetectionTypeEnum(str, Enum): class DetectionProxyRunner(threading.Thread): - def __init__(self, context: zmq.Context[zmq.Socket]) -> None: + def __init__(self, context ) -> None: threading.Thread.__init__(self) self.name = "detection_proxy" self.context = context