From 6c3ae43b1b2a1d608864236690c9b34aaf230e53 Mon Sep 17 00:00:00 2001 From: TJ Borromeo Date: Mon, 21 Sep 2015 18:41:13 -0700 Subject: [PATCH 01/11] Updating to Ubuntu 14.04 Just because. --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2af10e5f..828aa3b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,8 @@ # VERSION 0.1 # DOCKER-VERSION 0.1.6 -from ubuntu:12.04 +# update to 14.04, but lock versions at 12.04 for now +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 @@ -15,4 +16,4 @@ 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 -run npm install opencv || cat npm-debug.log +run npm install opencv@3.2.0 || cat npm-debug.log From c37b4ae9321a6988cdc45dfc886b9e368866ba80 Mon Sep 17 00:00:00 2001 From: TJ Borromeo Date: Mon, 21 Sep 2015 18:52:34 -0700 Subject: [PATCH 02/11] Bump versioning Pointing out that node's opencv is locked to v3.2.0. This should be updated (IMO) whenever it is known that node's opencv is stable and that prebuilt binaries are checked into the osx-binaries branch. --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 828aa3b1..2327dd9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ # 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 -# update to 14.04, but lock versions at 12.04 for now +# update to 14.04 from ubuntu:14.04 run apt-get update -qq run apt-get install -y software-properties-common python-software-properties @@ -16,4 +16,5 @@ 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 +# ensure npm installs at v3.2.0 vice tip run npm install opencv@3.2.0 || cat npm-debug.log From ee29e56c73e16f8887ed36f46cedf514364f32d5 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:19:53 +0200 Subject: [PATCH 03/11] add 12:04 dockerfile --- test/Dockerfile-ubuntu-12-04 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/Dockerfile-ubuntu-12-04 diff --git a/test/Dockerfile-ubuntu-12-04 b/test/Dockerfile-ubuntu-12-04 new file mode 100644 index 00000000..2af10e5f --- /dev/null +++ b/test/Dockerfile-ubuntu-12-04 @@ -0,0 +1,18 @@ +# This file describes how to build node-opencv into a runnable linux container with all dependencies installed +# To build: +# 1) Install docker (http://docker.io) +# 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 + +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 +run npm install opencv || cat npm-debug.log From 5d48db4bd09e80fc28549f493bdbb21c9d87d345 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:21:53 +0200 Subject: [PATCH 04/11] unpeg version - version in npm should _always_ be stable --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2327dd9d..3919141f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,4 @@ 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 # ensure npm installs at v3.2.0 vice tip -run npm install opencv@3.2.0 || cat npm-debug.log +run npm install opencv || cat npm-debug.log From 5663d6fac124701dbd3ed99b54deff51e17163fd Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:28:14 +0200 Subject: [PATCH 05/11] add Dockerfile 14.04 --- test/Dockerfile-ubuntu-14-04 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 test/Dockerfile-ubuntu-14-04 diff --git a/test/Dockerfile-ubuntu-14-04 b/test/Dockerfile-ubuntu-14-04 new file mode 100644 index 00000000..3919141f --- /dev/null +++ b/test/Dockerfile-ubuntu-14-04 @@ -0,0 +1,20 @@ +# This file describes how to build node-opencv into a runnable linux container with all dependencies installed +# To build: +# 1) Install docker (http://docker.io) +# 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.2 +# DOCKER-VERSION 8.1.2 + +# 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 +# ensure npm installs at v3.2.0 vice tip +run npm install opencv || cat npm-debug.log From b96c99e5c1a438129c994aeac4dd639ed859fdaa Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:32:50 +0200 Subject: [PATCH 06/11] build in travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ecdcd6db..f60e146a 100755 --- a/.travis.yml +++ b/.travis.yml @@ -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-12-04 -f test/Dockerfile-ubuntu-14-04 . before_script: - echo "Publishing native platform Binary Package? ->" $PUBLISH_BINARY From b5f62f1f34a407c3fd8728fb246851c507f27e2b Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:38:03 +0200 Subject: [PATCH 07/11] disable osx until https://github.com/travis-ci/travis-ci/issues/2311 --- .travis.yml | 2 +- Makefile | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f60e146a..b376422f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js os: - linux - - osx +# - osx matrix: allow_failures: diff --git a/Makefile b/Makefile index a9462b60..0d4c2d82 100644 --- a/Makefile +++ b/Makefile @@ -33,3 +33,10 @@ 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-12-04 -f test/Dockerfile-ubuntu-14-04 . + +.PHONY: travis-build From 83237831ac05bfb361cc4d719a08043f0840e73b Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:39:50 +0200 Subject: [PATCH 08/11] typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b376422f..be279c25 100755 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ install: - npm test - 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-12-04 -f test/Dockerfile-ubuntu-14-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 From 2f82d00951fa08a3a578788b687383bb87d56d13 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:47:51 +0200 Subject: [PATCH 09/11] disable iojs build until I can resolve nan issues --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be279c25..6c0f7978 100755 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: node_js: - '0.12' - - "iojs-v1.0.4" +# - "iojs-v1.0.4" sudo: required services: From b7ae20129458f2c1edbeb389c4947148b6cf8110 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 19:57:46 +0200 Subject: [PATCH 10/11] stupid whitespace --- .editorconfig | 2 +- Makefile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 162ee53a..dc57784a 100644 --- 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/Makefile b/Makefile index 0d4c2d82..98783792 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,6 @@ 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-12-04 -f test/Dockerfile-ubuntu-14-04 . - + 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 From 00bb8d98588951acfb3338e9c3a57c64408c5f40 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Tue, 22 Sep 2015 20:09:33 +0200 Subject: [PATCH 11/11] disable broken example --- examples/salt.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/salt.js b/examples/salt.js index 737e834e..25c98614 100755 --- 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); } } +*/