Skip to content

Commit

Permalink
⬆️ Update motionEye to 0.43 (dev) (#400)
Browse files Browse the repository at this point in the history
  • Loading branch information
frenck authored Apr 19, 2023
1 parent f7b0998 commit 5b2d9d0
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 20 deletions.
13 changes: 5 additions & 8 deletions motioneye/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -44,7 +43,7 @@ RUN \
v4l-utils=1.22.1-r2 \
\
&& curl -J -L -o /tmp/motion.tar.gz \
https:/Motion-Project/motion/archive/release-${MOTION_VERSION}.tar.gz \
"https:/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 \
Expand All @@ -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:/motioneye-project/motioneye/archive/${MOTIONEYE_VERSION}.tar.gz" \
\
&& apk del --no-cache --purge .build-dependencies \
&& rm -f -r /tmp/*
Expand Down
10 changes: 0 additions & 10 deletions motioneye/requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions motioneye/rootfs/etc/cont-init.d/motioneye.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file modified motioneye/rootfs/etc/cont-init.d/nginx.sh
100644 → 100755
Empty file.
Empty file modified motioneye/rootfs/etc/services.d/motioneye/finish
100644 → 100755
Empty file.
Empty file modified motioneye/rootfs/etc/services.d/motioneye/run
100644 → 100755
Empty file.
Empty file modified motioneye/rootfs/etc/services.d/nginx/finish
100644 → 100755
Empty file.
Empty file modified motioneye/rootfs/etc/services.d/nginx/run
100644 → 100755
Empty file.

0 comments on commit 5b2d9d0

Please sign in to comment.