From: Marcus Klein <marcus.klein@open-xchange.com>
Date: Mon, 28 Aug 2017 10:58:57 +0000 (+0200)
Subject: use motion 4.0 from Ubuntu Zesty
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=daecb6868af2287b740ea1a6f25ee48074eecf94;p=motioneye-debian

use motion 4.0 from Ubuntu Zesty

python-setuptools is needed to install tornado
gcc, libcurl4-openssl-dev, libssl-dev, python-dev is needed for installing pycurl
---

diff --git a/extra/Dockerfile b/extra/Dockerfile
index b2e9fba..daecd9e 100644
--- a/extra/Dockerfile
+++ b/extra/Dockerfile
@@ -3,25 +3,15 @@ LABEL maintainer="Conor Heine <conor.heine@gmail.com>"
 
 RUN apt-get --quiet update && \
     DEBIAN_FRONTEND="noninteractive" apt-get --quiet --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
-    automake \
-    autoconf \
-    build-essential \
+    gcc \
     ffmpeg \
-    git \
-    libav-tools \
-    libavcodec-dev \
-    libavformat-dev \
-    libavutil-dev \
     libcurl4-openssl-dev \
-    libjpeg-dev \
     libssl-dev \
-    libswscale-dev \
-    pkgconf \
+    motion \
     python-dev \
     python-pip \
     python-setuptools \
     python-wheel \
-    subversion \
     v4l-utils && \
     apt-get --quiet autoremove && \
     apt-get --quiet --yes clean && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/*.bin
@@ -29,16 +19,6 @@ RUN apt-get --quiet update && \
 # Pip
 RUN pip install tornado jinja2 pillow pycurl
 
-RUN cd /tmp && git clone --branch 4.0 https://github.com/Motion-Project/motion.git motion-project
-RUN cd /tmp/motion-project && \
-    autoreconf -fiv && \
-    ./configure --prefix=/usr --without-pgsql --without-sqlite3 --without-mysql --with-ffmpeg=/usr && \
-    make && \
-    touch README \
-    make install && \
-    cp motion /usr/local/bin/motion && cd / && \
-    rm -rf /tmp/motion-project
-
 RUN pip install motioneye
 
 # R/W needed for motioneye to update configurations