From fab65d7b01ff2f45cccbc867a6f1bb7b679b6012 Mon Sep 17 00:00:00 2001
From: Marcus Klein <marcus.klein@open-xchange.com>
Date: Wed, 15 Nov 2017 09:20:48 +0100
Subject: [PATCH] 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
---
 extra/Dockerfile             |  2 +-
 extra/Dockerfile.armv7-armhf | 10 ++++++----
 extra/Dockerfile.local       |  2 +-
 extra/sources.list           |  3 ---
 4 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 extra/sources.list

diff --git a/extra/Dockerfile b/extra/Dockerfile
index e5b9e11..49008ae 100644
--- 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 191eca0..f3135dc 100644
--- 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 3da5c67..009d7b7 100644
--- 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
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
-- 
2.39.5