⬆️ Update motionEye to 0.43 (dev) (#400)

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 \
-    \
+        "https://github.com/motioneye-project/motioneye/archive/${MOTIONEYE_VERSION}.tar.gz" \
-    && pip install --no-cache-dir -r /tmp/requirements.txt \
     \
     && apk del --no-cache --purge .build-dependencies \
     && rm -f -r /tmp/*

motioneye/requirements.txt

@@ -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

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