From: Marcus Klein Date: Sun, 5 Nov 2017 10:41:44 +0000 (+0100) Subject: Try Ubuntu Zesty for Raspberry Pi Docker image X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=ce00a183d3cd6913577d099f742831dca684324b;p=motioneye-debian Try Ubuntu Zesty for Raspberry Pi Docker image --- diff --git a/extra/Dockerfile b/extra/Dockerfile index 93b7078..27d7b41 100644 --- 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 d920663..8f41567 100644 --- a/extra/Dockerfile.armv7-armhf +++ b/extra/Dockerfile.armv7-armhf @@ -1,21 +1,11 @@ - -FROM multiarch/ubuntu-debootstrap:armhf-vivid -MAINTAINER Conor Heine - -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 " 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 98e5c1c..b013918 100644 --- 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