From 75de9fe3362dce6a1f87fe69ba8357f91c07c251 Mon Sep 17 00:00:00 2001
From: Daniel Nowak <13685818+lowlyocean@users.noreply.github.com>
Date: Mon, 13 May 2024 15:14:13 -0400
Subject: [PATCH] Copy over correct pip install'd packages

---
 docker/main/Dockerfile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 7d5d37932..daf07d48f 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -153,18 +153,12 @@ RUN apt-get -qq update && apt-get -qq install -y \
 COPY docker/main/requirements.txt /requirements.txt
 RUN PIP_IGNORE_INSTALLED=0 pip3 install -r /requirements.txt
 
-RUN PIP_IGNORE_INSTALLED=0 pip3 install --no-deps rich filterpy==1.4.5 norfair==2.1.1
-
-RUN PIP_IGNORE_INSTALLED=0 pip3 install --no-deps norfair==2.2.0
-
-RUN PIP_IGNORE_INSTALLED=0 pip3 install onvif_zeep
-
-#RUN PIP_IGNORE_INSTALLED=0 pip3 install --no-deps zeep==3.0.0 onvif_zeep
+RUN PIP_IGNORE_INSTALLED=0 pip3 install rich filterpy==1.4.5 zeep==3.0.0 onvif_zeep && \
+    pip3 install --no-deps norfair==2.2.0
 
 COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
 RUN PIP_IGNORE_INSTALLED=0 pip3 wheel --wheel-dir=/wheels -r /requirements-wheels.txt
 
-
 # Collect deps in a single layer
 FROM scratch AS deps-rootfs
 COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/
@@ -193,7 +187,7 @@ ENV PATH="/usr/lib/btbn-ffmpeg/bin:/usr/local/go2rtc/bin:/usr/local/nginx/sbin:$
 RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
     /deps/install_deps.sh
 
-COPY --from=wheels /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages
+COPY --from=wheels /usr/local/lib/python3.9/dist-packages /usr/local/lib/python3.9/dist-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