Merge pull request #507 from peterbraden/fix-travis

Fix failing Travis Build. (WIP)

.travis.yml

@@ -9,8 +9,8 @@ matrix:
     - os: osx
 
 node_js:
-  - '0.12'
-#  - "iojs-v1.0.4"
+  - '6'
+  - '7'
 
 sudo: required
 services:
@@ -56,7 +56,6 @@ install:
   # build from source, run test and generate code coverage
   - make cover
   - NODE_OPENCV_DEBUG=true node lib/opencv.js
-  - docker build -t peterbraden/node-opencv-ubuntu-12-04 -f test/Dockerfile-ubuntu-12-04 .
   - docker build -t peterbraden/node-opencv-ubuntu-14-04 -f test/Dockerfile-ubuntu-14-04 .
 
 before_script:

test/Dockerfile-ubuntu-12-04

@@ -1,13 +0,0 @@
-# This is a dockerfile to test the build on ubuntu 12.04
-from	ubuntu:12.04
-run apt-get update -qq
-run apt-get install -y software-properties-common python-software-properties
-run add-apt-repository -y ppa:kubuntu-ppa/backports
-run apt-get update
-run apt-get install -y libcv-dev libcvaux-dev libhighgui-dev libopencv-dev
-run curl -sL https://deb.nodesource.com/setup | bash -
-run apt-get install -y nodejs
-WORKDIR /root/node-opencv
-add . /root/node-opencv
-run	npm install --unsafe-perm --build-from-source || cat npm-debug.log
-run make test

test/Dockerfile-ubuntu-14-04

@@ -5,7 +5,7 @@ run apt-get install -y software-properties-common python-software-properties
 run add-apt-repository -y ppa:kubuntu-ppa/backports
 run apt-get update
 run apt-get install -y libcv-dev libcvaux-dev libhighgui-dev libopencv-dev
-run curl -sL https://deb.nodesource.com/setup | bash -
+run curl -sL https://deb.nodesource.com/setup_6.x | bash -
 run apt-get install -y nodejs
 WORKDIR /root/node-opencv
 add . /root/node-opencv