Skip to content

Commit

Permalink
use motion 4.2.2 for Docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
kleini committed Apr 2, 2019
1 parent 86d9429 commit 2f5f26e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions extra/Dockerfile
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 Down
3 changes: 2 additions & 1 deletion extra/Dockerfile.armv7-armhf
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 Down

0 comments on commit 2f5f26e

Please sign in to comment.