use same procedure as with x86 build

diff --git a/extra/Dockerfile b/extra/Dockerfile
index 27d7b411ee2b21ce93cbc44b481ae4419bb66054..324a27b3ce14b80c865feb41db97244cb09cd565 100644 (file)
--- a/extra/Dockerfile
+++ b/extra/Dockerfile
@@ -31,8 +31,7 @@ RUN apt-get --quiet update && \
     python-pip \
     python-setuptools \
     python-wheel && \
-    apt-get autoremove --yes && \
-    apt-get --quiet autoremove && \
+    apt-get --quiet autoremove --yes && \
     apt-get --quiet --yes clean && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/*.bin
 
 # R/W needed for motioneye to update configurations

diff --git a/extra/Dockerfile.armv7-armhf b/extra/Dockerfile.armv7-armhf
index 8f41567ab3fc99feab05316fe7351726bb9d32df..8f096e13be17d2c96f1a2e1527c3a57ec42e74d8 100644 (file)
--- a/extra/Dockerfile.armv7-armhf
+++ b/extra/Dockerfile.armv7-armhf
@@ -1,45 +1,40 @@
 FROM multiarch/ubuntu-debootstrap:armhf-zesty
 LABEL maintainer="Marcus Klein <himself@kleini.org>"
 
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.docker.dockerfile="extra/Dockerfile" \
+    org.label-schema.license="GPLv3" \
+    org.label-schema.name="motioneye" \
+    org.label-schema.url="https://github.com/ccrisan/motioneye/wiki" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-type="Git" \
+    org.label-schema.vcs-url="https://github.com/ccrisan/motioneye.git"
+
 ADD 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 \
-    automake \
-       autoconf \
-       build-essential \
-       ffmpeg \
-       git \
-       libav-tools \
-       libavcodec-dev \
-       libavformat-dev \
-       libavutil-dev \
-       libcurl4-openssl-dev \
-       libjpeg-dev \
-       libssl-dev \
-       libswscale-dev \
-       pkgconf \
-    python-dev \
+    curl \
+    ffmpeg \
+    lsb-release \
+    motion \
+    python-jinja2 \
+    python-olefile \
+    python-pip \
+    python-pycurl \
+    python-setuptools \
+    python-tornado \
+    python-wheel \
+    v4l-utils && \
+    pip install motioneye && \
+    apt-get purge --yes \
     python-pip \
-       python-setuptools \
-       subversion \
-       v4l-utils && \
-    apt-get clean
-
-# 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
+    python-setuptools \
+    python-wheel && \
+    apt-get --quiet autoremove --yes && \
+    apt-get --quiet --yes clean && rm -rf /var/lib/apt/lists/* && rm -f /var/cache/apt/*.bin
 
 # R/W needed for motioneye to update configurations
 VOLUME /etc/motioneye
@@ -57,4 +52,3 @@ CMD test -e /etc/motioneye/motioneye.conf || \
     /usr/local/bin/meyectl startserver -c /etc/motioneye/motioneye.conf
 
 EXPOSE 8765
-