Try Ubuntu Zesty for Raspberry Pi Docker image

diff --git a/extra/Dockerfile b/extra/Dockerfile
index 93b7078efbdbbe47627bda5d895149a0a677b227..27d7b411ee2b21ce93cbc44b481ae4419bb66054 100644 (file)
--- a/extra/Dockerfile
+++ b/extra/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get --quiet update && \
     lsb-release \
     motion \
     python-jinja2 \
+    python-olefile \
     python-pip \
     python-pycurl \
     python-setuptools \

diff --git a/extra/Dockerfile.armv7-armhf b/extra/Dockerfile.armv7-armhf
index d9206635fd1b038423c51b5869fadf3234e8c683..8f41567ab3fc99feab05316fe7351726bb9d32df 100644 (file)
--- a/extra/Dockerfile.armv7-armhf
+++ b/extra/Dockerfile.armv7-armhf
@@ -1,21 +1,11 @@
-
-FROM multiarch/ubuntu-debootstrap:armhf-vivid
-MAINTAINER Conor Heine <conor.heine@gmail.com>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN locale-gen en_US.UTF-8
-ENV LANGUAGE en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LC_TYPE en_US.UTF-8
-ENV TZ America/Los_Angeles
+FROM multiarch/ubuntu-debootstrap:armhf-zesty
+LABEL maintainer="Marcus Klein <himself@kleini.org>"
 
 ADD sources.list /etc/apt/
 
-RUN apt-get update && \
-    apt-get --yes install \
-       automake \
+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 \
@@ -29,8 +19,8 @@ RUN apt-get update && \
        libssl-dev \
        libswscale-dev \
        pkgconf \
-        python-dev \
-        python-pip \
+    python-dev \
+    python-pip \
        python-setuptools \
        subversion \
        v4l-utils && \

diff --git a/extra/sources.list b/extra/sources.list
index 98e5c1cf31f710e1c7621a2135ec9c4562fb5d13..b0139180f51d2a59f922b01d31915597777f8e7a 100644 (file)
--- a/extra/sources.list
+++ b/extra/sources.list
@@ -1,35 +1,3 @@
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-
-deb http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted
-
-## Uncomment the following two lines to add software from the 'universe'
-## repository.
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://ports.ubuntu.com/ubuntu-ports/ vivid universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid universe
-deb http://ports.ubuntu.com/ubuntu-ports/ vivid-updates universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-updates universe
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-# deb http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted
-# deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted
-deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security universe
-# deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security multiverse
+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