From 5b2d9d04de9c310b531ba97788e2b821971a91c6 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 19 Apr 2023 11:10:52 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20motionEye=20to=20?=
 =?UTF-8?q?0.43=20(dev)=20(#400)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 motioneye/Dockerfile                             | 13 +++++--------
 motioneye/requirements.txt                       | 10 ----------
 motioneye/rootfs/etc/cont-init.d/motioneye.sh    |  4 ++--
 motioneye/rootfs/etc/cont-init.d/nginx.sh        |  0
 motioneye/rootfs/etc/services.d/motioneye/finish |  0
 motioneye/rootfs/etc/services.d/motioneye/run    |  0
 motioneye/rootfs/etc/services.d/nginx/finish     |  0
 motioneye/rootfs/etc/services.d/nginx/run        |  0
 8 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 motioneye/requirements.txt
 mode change 100644 => 100755 motioneye/rootfs/etc/cont-init.d/motioneye.sh
 mode change 100644 => 100755 motioneye/rootfs/etc/cont-init.d/nginx.sh
 mode change 100644 => 100755 motioneye/rootfs/etc/services.d/motioneye/finish
 mode change 100644 => 100755 motioneye/rootfs/etc/services.d/motioneye/run
 mode change 100644 => 100755 motioneye/rootfs/etc/services.d/nginx/finish
 mode change 100644 => 100755 motioneye/rootfs/etc/services.d/nginx/run

diff --git a/motioneye/Dockerfile b/motioneye/Dockerfile
index b36063a..2a032d4 100755
--- a/motioneye/Dockerfile
+++ b/motioneye/Dockerfile
@@ -5,10 +5,9 @@ FROM ${BUILD_FROM}
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# Copy Python requirements file
-COPY requirements.txt /tmp/
-
 # Setup base
+ARG MOTION_VERSION="4.4.0"
+ARG MOTIONEYE_VERSION="ef1c42b57895324a2fb7129e63d37412061a82e2"
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache --virtual .build-dependencies \
@@ -44,7 +43,7 @@ RUN \
         v4l-utils=1.22.1-r2 \
     \
     && curl -J -L -o /tmp/motion.tar.gz \
-        https://github.com/Motion-Project/motion/archive/release-${MOTION_VERSION}.tar.gz \
+        "https://github.com/Motion-Project/motion/archive/release-${MOTION_VERSION}.tar.gz" \
     && mkdir -p /tmp/motion \
     && tar zxf /tmp/motion.tar.gz -C \
         /tmp/motion --strip-components=1 \
@@ -56,12 +55,10 @@ RUN \
             --without-sqlite3 \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --without-optimizecpu \
     && make install \
     \
-    && python -m ensurepip \
-    \
-    && pip install --no-cache-dir -r /tmp/requirements.txt \
+    && pip install --no-cache-dir \
+        "https://github.com/motioneye-project/motioneye/archive/${MOTIONEYE_VERSION}.tar.gz" \
     \
     && apk del --no-cache --purge .build-dependencies \
     && rm -f -r /tmp/*
diff --git a/motioneye/requirements.txt b/motioneye/requirements.txt
deleted file mode 100644
index d418f92..0000000
--- a/motioneye/requirements.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-backports_abc==0.5
-futures==3.3.0
-jinja2==2.11.3
-MarkupSafe==1.1.1
-motioneye==0.42.1
-pillow==6.2.2
-pycurl==7.43.0.5
-singledispatch==3.7.0
-six==1.16.0
-tornado==5.1.1
diff --git a/motioneye/rootfs/etc/cont-init.d/motioneye.sh b/motioneye/rootfs/etc/cont-init.d/motioneye.sh
old mode 100644
new mode 100755
index b96c571..d296877
--- a/motioneye/rootfs/etc/cont-init.d/motioneye.sh
+++ b/motioneye/rootfs/etc/cont-init.d/motioneye.sh
@@ -18,13 +18,13 @@ fi
 # Migration
 if bashio::fs.file_exists "${CONF}"; then
     bashio::log.debug "Running startup migrations"
-    /usr/lib/python2.7/site-packages/motioneye/scripts/migrateconf.sh "${CONF}"
+    /usr/lib/python3.10/site-packages/motioneye/scripts/migrateconf.sh "${CONF}"
     find /data/motioneye/ \
         -maxdepth 1 \
         -type f \
         -name "thread-*.conf" \
         -exec \
-            /usr/lib/python2.7/site-packages/motioneye/scripts/migrateconf.sh {} \;
+            /usr/lib/python3.10/site-packages/motioneye/scripts/migrateconf.sh {} \;
 fi
 
 # Configure motion webcontrol access
diff --git a/motioneye/rootfs/etc/cont-init.d/nginx.sh b/motioneye/rootfs/etc/cont-init.d/nginx.sh
old mode 100644
new mode 100755
diff --git a/motioneye/rootfs/etc/services.d/motioneye/finish b/motioneye/rootfs/etc/services.d/motioneye/finish
old mode 100644
new mode 100755
diff --git a/motioneye/rootfs/etc/services.d/motioneye/run b/motioneye/rootfs/etc/services.d/motioneye/run
old mode 100644
new mode 100755
diff --git a/motioneye/rootfs/etc/services.d/nginx/finish b/motioneye/rootfs/etc/services.d/nginx/finish
old mode 100644
new mode 100755
diff --git a/motioneye/rootfs/etc/services.d/nginx/run b/motioneye/rootfs/etc/services.d/nginx/run
old mode 100644
new mode 100755