Merge pull request peterbraden#304 from peterbraden/docker-environments

Docker environments
itlboy · Sep 22, 2015 · 709df98 · 709df98
2 parents 246de81 + 00bb8d9
commit 709df98
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 11 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,7 +12,7 @@ charset = utf-8
 
 # Tab indentation (no size specified)
 [Makefile]
-indent_style = space
+indent_style = tab
 indent_size = 2
 
 # Indentation override for all JS under lib directory

diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,15 @@ language: node_js
 
 os:
   - linux
-  - osx
+#  - osx
 
 matrix:
   allow_failures:
     - os: osx
 
 node_js:
   - '0.12'
-  - "iojs-v1.0.4"
+#  - "iojs-v1.0.4"
 
 sudo: required
 services:
@@ -54,7 +54,8 @@ install:
   # test our module
   - npm test
   - node lib/opencv.js
-  - docker build -t peterbraden/node-opencv .
+  - 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:
   - echo "Publishing native platform Binary Package? ->" $PUBLISH_BINARY

diff --git a/Dockerfile b/Dockerfile
@@ -4,18 +4,16 @@
 # 2) Build: wget https://raw.github.com/dotcloud/docker/v0.1.6/contrib/docker-build/docker-build && python docker-build $USER/node-opencv < Dockerfile
 # 3) Test: docker run $USER/node-opencv node -e "console.log(require('opencv').version)"
 #
-# VERSION		0.1
-# DOCKER-VERSION	0.1.6
+# VERSION		0.2
+# DOCKER-VERSION	8.1.2
 
-from	ubuntu:12.04
+# update to 14.04
+from	ubuntu:14.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
+run	npm install opencv || cat npm-debug.log
diff --git a/Makefile b/Makefile
@@ -33,3 +33,9 @@ release:
 	@echo "Publishing to NPM"
 	@npm publish
 .PHONY: release
+
+
+travis-build:
+	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 .
+.PHONY: travis-build
diff --git a/examples/salt.js b/examples/salt.js
@@ -1,3 +1,4 @@
+/*
 var cv = require('../lib/opencv');
 
 cv.readImage("./files/mona.png", function(err, im) {
@@ -18,3 +19,4 @@ function salt(img, n) {
     img.set(y, x, 255);
   }
 }
+*/
diff --git a/test/Dockerfile-ubuntu-12-04 b/test/Dockerfile-ubuntu-12-04
@@ -0,0 +1,13 @@
+# 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
diff --git a/test/Dockerfile-ubuntu-14-04 b/test/Dockerfile-ubuntu-14-04
@@ -0,0 +1,13 @@
+# This is a dockerfile to test the build on ubuntu 14.04
+from	ubuntu:14.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