From 535aec290693b4bf57d85dcf8b8ae081bbfd169f Mon Sep 17 00:00:00 2001 From: Marcus Klein Date: Fri, 1 Sep 2017 10:28:01 +0200 Subject: [PATCH] try to build amd64 and armhf Docker images --- .travis.yml | 18 ++++++++++++++---- extra/Dockerfile.armv7-armhf | 6 ++++-- extra/sources.list | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 extra/sources.list diff --git a/.travis.yml b/.travis.yml index 66e4b17..769546a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,21 @@ services: - docker before_install: - docker info + - docker run --rm --privileged multiarch/qemu-user-static:register --reset install: - - docker build --build-arg VCS_REF=$TRAVIS_COMMIT --build-arg BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ") -t $DOCKER_REPO:$TRAVIS_BRANCH extra - - docker run --rm $DOCKER_REPO:$TRAVIS_BRANCH uname -a + - docker build --build-arg VCS_REF=$TRAVIS_COMMIT --build-arg BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ") -t $DOCKER_REPO:$TRAVIS_BRANCH-$TARGET -f extra/Dockerfile${EXT} extra + - docker run --rm $DOCKER_REPO:$TRAVIS_BRANCH-$TARGET uname -a after_success: - docker login -e=$DOCKER_EMAIL -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD - - docker push $DOCKER_REPO:$TRAVIS_BRANCH + - docker push $DOCKER_REPO:$TRAVIS_BRANCH-$TARGET env: - # DOCKER_REPO + # global: + # DOCKER_REPO + # DOCKER_USERNAME + # DOCKER_PASSWORD + # DOCKER_EMAIL + matrix: + - TARGET=amd64 EXT="" + - TARGET=armhf EXT=".armv7-armhf" +matrix: + fast_finish: true diff --git a/extra/Dockerfile.armv7-armhf b/extra/Dockerfile.armv7-armhf index 088315e..d920663 100644 --- a/extra/Dockerfile.armv7-armhf +++ b/extra/Dockerfile.armv7-armhf @@ -1,5 +1,5 @@ -FROM armv7/armhf-ubuntu:15.04 +FROM multiarch/ubuntu-debootstrap:armhf-vivid MAINTAINER Conor Heine ENV DEBIAN_FRONTEND noninteractive @@ -11,6 +11,8 @@ ENV LANG en_US.UTF-8 ENV LC_TYPE en_US.UTF-8 ENV TZ America/Los_Angeles +ADD sources.list /etc/apt/ + RUN apt-get update && \ apt-get --yes install \ automake \ @@ -58,7 +60,7 @@ VOLUME /var/run/motion # Video & images VOLUME /var/lib/motioneye -ADD extra /usr/share/motioneye/extra/ +ADD 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 ; \ diff --git a/extra/sources.list b/extra/sources.list new file mode 100644 index 0000000..98e5c1c --- /dev/null +++ b/extra/sources.list @@ -0,0 +1,35 @@ +# 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 -- 2.39.5