upgrade Docker image to newly released motion 4.1

base armhf Docker image on Debian because we do not have motion for armhf for Ubuntu

diff --git a/extra/Dockerfile b/extra/Dockerfile
index e5b9e113fd89066e288d93e42db25ae86712fff9..49008aeebf0d94c135bdff9183c341f5bd225407 100644 (file)
--- a/extra/Dockerfile
+++ b/extra/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get --quiet update && \
     python-tornado \
     python-wheel \
     v4l-utils && \
-    curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.0.1/yakkety_motion_4.0.1-1_amd64.deb && \
+    curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.1/artful_motion_4.1-1_amd64.deb && \
     dpkg -i /tmp/motion.deb && \
     rm /tmp/motion.deb && \
     pip install motioneye && \

diff --git a/extra/Dockerfile.armv7-armhf b/extra/Dockerfile.armv7-armhf
index 191eca0450f1b7f1e96ee24c2a1c17ed4eea2b21..f3135dcc15b50a65a26f8f81f2ed62e64d8ffabb 100644 (file)
--- a/extra/Dockerfile.armv7-armhf
+++ b/extra/Dockerfile.armv7-armhf
@@ -1,4 +1,4 @@
-FROM multiarch/ubuntu-debootstrap:armhf-zesty
+FROM multiarch/debian-debootstrap:armhf-stretch
 LABEL maintainer="Marcus Klein <himself@kleini.org>"
 
 ARG BUILD_DATE
@@ -12,14 +12,13 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-type="Git" \
     org.label-schema.vcs-url="https://github.com/ccrisan/motioneye.git"
 
-ADD extra/sources.list /etc/apt/
-
 RUN apt-get --quiet update && \
     DEBIAN_FRONTEND="noninteractive" apt-get --quiet --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
     curl \
     ffmpeg \
+    libmariadbclient18 \
+    libpq5 \
     lsb-release \
-    motion \
     python-jinja2 \
     python-pil \
     python-pip \
@@ -29,6 +28,9 @@ RUN apt-get --quiet update && \
     python-wheel \
     v4l-utils \
     zlib1g-dev && \
+    curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.1/pi_stretch_motion_4.1-1_armhf.deb && \
+    dpkg -i /tmp/motion.deb && \
+    rm /tmp/motion.deb && \
     pip install motioneye && \
     apt-get purge --yes \
     python-pip \

diff --git a/extra/Dockerfile.local b/extra/Dockerfile.local
index 3da5c67a051a2ee501aeb96d869389bef8ba4662..009d7b72a0c7a4d2a0fe78cb5195fad39e870cee 100644 (file)
--- a/extra/Dockerfile.local
+++ b/extra/Dockerfile.local
@@ -29,7 +29,7 @@ RUN apt-get --quiet update && \
     python-tornado \
     python-wheel \
     v4l-utils && \
-    curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.0.1/yakkety_motion_4.0.1-1_amd64.deb && \
+    curl -L --output /tmp/motion.deb https://github.com/Motion-Project/motion/releases/download/release-4.1/artful_motion_4.1-1_amd64.deb && \
     dpkg -i /tmp/motion.deb && \
     rm /tmp/motion.deb && \
     cd /tmp/motioneye && \

diff --git a/extra/sources.list b/extra/sources.list
deleted file mode 100644 (file)
index b013918..0000000
--- a/extra/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe