Always use local Git checkout of motioneye instead of released one.

This makes us get the latest commits built into Docker images on
branches and released versions on the master branch.
Added the missing Raspberry Pi firmware files.

diff --git a/extra/Dockerfile b/extra/Dockerfile
index 49008aeebf0d94c135bdff9183c341f5bd225407..67b56cb62254aa9aa61e57783b75985ae9a7c578 100644 (file)
--- a/extra/Dockerfile
+++ b/extra/Dockerfile
@@ -12,7 +12,10 @@ 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"
 
+COPY . /tmp/motioneye
+
 RUN apt-get --quiet update && \
+    apt-get --quiet upgrade --yes && \
     DEBIAN_FRONTEND="noninteractive" apt-get --quiet --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
     curl \
     ffmpeg \
@@ -30,7 +33,8 @@ RUN apt-get --quiet update && \
     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 && \
+    pip install /tmp/motioneye && \
+    rm -rf /tmp/motioneye && \
     apt-get purge --yes \
     python-pip \
     python-setuptools \

diff --git a/extra/Dockerfile.armv7-armhf b/extra/Dockerfile.armv7-armhf
index f3135dcc15b50a65a26f8f81f2ed62e64d8ffabb..6ac3bb08e9a16222c00a7807bac607291fae51fb 100644 (file)
--- a/extra/Dockerfile.armv7-armhf
+++ b/extra/Dockerfile.armv7-armhf
@@ -12,10 +12,15 @@ 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"
 
+COPY . /tmp/motioneye
+ENV LD_LIBRARY_PATH /opt/vc/lib
+
 RUN apt-get --quiet update && \
+    apt-get --quiet upgrade --yes && \
     DEBIAN_FRONTEND="noninteractive" apt-get --quiet --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
     curl \
     ffmpeg \
+    git \
     libmariadbclient18 \
     libpq5 \
     lsb-release \
@@ -28,11 +33,16 @@ RUN apt-get --quiet update && \
     python-wheel \
     v4l-utils \
     zlib1g-dev && \
+    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/pi_stretch_motion_4.1-1_armhf.deb && \
     dpkg -i /tmp/motion.deb && \
     rm /tmp/motion.deb && \
-    pip install motioneye && \
+    pip install /tmp/motioneye && \
+    rm -rf /tmp/motioneye && \
     apt-get purge --yes \
+    git \
     python-pip \
     python-setuptools \
     python-wheel && \

diff --git a/extra/Dockerfile.local b/extra/Dockerfile.local
deleted file mode 100644 (file)
index 009d7b7..0000000
--- a/extra/Dockerfile.local
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM ubuntu:17.10
-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"
-
-COPY . /tmp/motioneye
-
-RUN apt-get --quiet update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get --quiet --yes --option Dpkg::Options::="--force-confnew" --no-install-recommends install \
-    curl \
-    ffmpeg \
-    libmysqlclient20 \
-    libpq5 \
-    lsb-release \
-    python-jinja2 \
-    python-pil \
-    python-pip \
-    python-pycurl \
-    python-setuptools \
-    python-tornado \
-    python-wheel \
-    v4l-utils && \
-    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 && \
-    pip install /tmp/motioneye && \
-    rm -rf /tmp/motioneye && \ 
-    apt-get purge --yes \
-    python-pip \
-    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
-
-# PIDs
-VOLUME /var/run/motion
-
-# Video & images
-VOLUME /var/lib/motioneye
-
-ADD extra/motioneye.conf.sample /usr/share/motioneye/extra/
-
-CMD test -e /etc/motioneye/motioneye.conf || \    
-    cp /usr/share/motioneye/extra/motioneye.conf.sample /etc/motioneye/motioneye.conf ; \
-    /usr/local/bin/meyectl startserver -c /etc/motioneye/motioneye.conf
-
-EXPOSE 8765