Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use motion 4.2.2 for Docker images #1211

Merged
merged 1 commit into from
Apr 26, 2019
Merged

use motion 4.2.2 for Docker images #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions extra/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:18.10
LABEL maintainer="Marcus Klein <[email protected]>"

ARG BUILD_DATE
Expand All @@ -19,6 +19,7 @@ RUN apt-get update && \
DEBIAN_FRONTEND="noninteractive" apt-get --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
curl \
ffmpeg \
libmicrohttpd12 \
libmysqlclient20 \
libpq5 \
lsb-release \
Expand All @@ -33,7 +34,7 @@ RUN apt-get update && \
python-wheel \
tzdata \
v4l-utils && \
curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.1.1/bionic_motion_4.1.1-1_amd64.deb && \
curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.2.2/cosmic_motion_4.2.2-1_amd64.deb && \
dpkg -i /tmp/motion.deb && \
rm /tmp/motion.deb && \
pip install /tmp/motioneye && \
Expand All @@ -58,6 +59,6 @@ ADD extra/motioneye.conf.sample /usr/share/motioneye/extra/

CMD test -e /etc/motioneye/motioneye.conf || \
cp /usr/share/motioneye/extra/motioneye.conf.sample /etc/motioneye/motioneye.conf ; \
/usr/local/bin/meyectl startserver -c /etc/motioneye/motioneye.conf
/usr/local/bin/meyectl startserver -c /etc/motioneye/motioneye.conf -d

EXPOSE 8765
5 changes: 3 additions & 2 deletions extra/Dockerfile.armv7-armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN apt-get update && \
ffmpeg \
git \
libmariadbclient18 \
libmicrohttpd12 \
libpq5 \
lsb-release \
mosquitto-clients \
Expand All @@ -39,7 +40,7 @@ RUN apt-get update && \
git clone --depth 1 https://github.com/Hexxeh/rpi-firmware.git /tmp/rpi-firmware && \
cp -rv /tmp/rpi-firmware/vc/hardfp/opt/vc /opt && \
rm -rf /tmp/rpi-firmware && \
curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.1.1/pi_stretch_motion_4.1.1-1_armhf.deb && \
curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.2.2/pi_stretch_motion_4.2.2-1_armhf.deb && \
dpkg -i /tmp/motion.deb && \
rm /tmp/motion.deb && \
pip install /tmp/motioneye && \
Expand All @@ -65,6 +66,6 @@ ADD extra/motioneye.conf.sample /usr/share/motioneye/extra/

CMD test -e /etc/motioneye/motioneye.conf || \
cp /usr/share/motioneye/extra/motioneye.conf.sample /etc/motioneye/motioneye.conf ; \
/usr/local/bin/meyectl startserver -c /etc/motioneye/motioneye.conf
/usr/local/bin/meyectl startserver -c /etc/motioneye/motioneye.conf -d
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really want -d here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was necessary for me. Otherwise motioneye told me during network camera registration: "Protocol "rtsp" is not supported by libcurl".

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I just need more time to investigate, what happened there.


EXPOSE 8765