Remove python

Author: hideyuki

Dockerfile

@@ -1,35 +1,20 @@
 # Inherit from Heroku's stack
-FROM heroku/python
-
-# Which version of node?
-ENV NODE_ENGINE 4.1.1
-# Locate our binaries
-ENV PATH /app/heroku/node/bin/:/app/user/node_modules/.bin:$PATH
+FROM heroku/nodejs
 
 # Install OpenCV
 RUN mkdir -p /app/.heroku/opencv /tmp/opencv
 ADD Install-OpenCV /tmp/opencv
 WORKDIR /tmp/opencv/Ubuntu
 RUN echo 'deb http://archive.ubuntu.com/ubuntu trusty multiverse' >> /etc/apt/sources.list && apt-get update
-RUN version=2.4.11 ./opencv_latest.sh
+RUN version=2.4.13 ./opencv_latest.sh
 
-# Create some needed directories
-RUN mkdir -p /app/heroku/node /app/.profile.d
 WORKDIR /app/user
 
-# Install node
-RUN curl -s https://s3pository.heroku.com/node/v$NODE_ENGINE/node-v$NODE_ENGINE-linux-x64.tar.gz | tar --strip-components=1 -xz -C /app/heroku/node
-
-# Export the node path in .profile.d
-RUN echo "export PATH=\"/app/heroku/node/bin:/app/user/node_modules/.bin:\$PATH\"" > /app/.profile.d/nodejs.sh
-RUN echo "export PKG_CONFIG_PATH=\"/app/.heroku/opencv/lib/pkgconfig\"" >> /app/.profile.d/nodejs.sh
-RUN echo "export LD_LIBRARY_PATH=\"/app/.heroku/opencv/lib/:$LD_LIBRARY_PATH\"" >> /app/.profile.d/nodejs.sh
-
 # Install leptonica for tesseract
 RUN mkdir ~/temp &&\ 
     cd ~/temp/ &&\ 
     wget http://www.leptonica.org/source/leptonica-1.69.tar.gz &&\ 
-    tar -zxvf leptonica-1.69.tar.gz &&\ 
+    tar xvf leptonica-1.69.tar.gz &&\ 
     cd leptonica-1.69 &&\ 
     ./configure &&\ 
     make &&\ 
@@ -40,9 +25,9 @@ RUN mkdir ~/temp &&\
 # Install tesseract
 RUN mkdir ~/temp &&\
     cd ~/temp/ &&\ 
-    wget https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz &&\ 
-    tar xvf tesseract-ocr-3.02.02.tar.gz &&\ 
-    cd tesseract-ocr &&\ 
+    wget https://github.com/tesseract-ocr/tesseract/archive/3.04.01.tar.gz &&\ 
+    tar xvf 3.04.01.tar.gz &&\ 
+    cd tesseract-3.04.01 &&\ 
     ./autogen.sh &&\ 
     mkdir ~/local &&\ 
     ./configure --prefix=$HOME/local/ &&\ 
@@ -53,14 +38,16 @@ RUN mkdir ~/temp &&\
 
 # Add tesseact eng data
 RUN cd ~/local/share &&\ 
-    wget https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz &&\ 
-    tar xvf tesseract-ocr-3.02.eng.tar.gz &&\
-    rm -rf tesseract-ocr-3.02.eng.tar.gz
+    wget https://github.com/tesseract-ocr/tessdata/archive/3.04.00.tar.gz &&\ 
+    tar xvf 3.04.00.tar.gz &&\
+    mkdir tesseract-ocr &&\
+    cp tessdata-3.04.00/eng* tesseract-ocr/ &&\
+    rm -rf 3.04.00.tar.gz tessdata-3.04.00
 
 ENV PATH $PATH:/root/local/bin
 ENV TESSDATA_PREFIX=/root/local/share/tesseract-ocr/
 
 ONBUILD ADD package.json /app/user/
-ONBUILD RUN /app/heroku/node/bin/npm install
+ONBUILD RUN npm install
 ONBUILD ADD . /app/user/
 

Install-OpenCV/Ubuntu/dependencies.sh

@@ -25,8 +25,6 @@ install_dependency libxine2-dev
 install_dependency libgstreamer0.10-dev
 install_dependency libgstreamer-plugins-base0.10-dev
 install_dependency libv4l-dev
-install_dependency python-dev
-install_dependency python-numpy
 install_dependency libtbb-dev
 install_dependency libqt4-dev
 install_dependency libgtk2.0-dev

Install-OpenCV/Ubuntu/opencv_install.sh

@@ -38,7 +38,7 @@ fi
 cd opencv-$version
 mkdir build
 cd build
-cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/app/.heroku/opencv -D BUILD_opencv_python2=ON -D WITH_V4L=ON -D INSTALL_C_EXAMPLES=ON -D INSTALL_PYTHON_EXAMPLES=ON -D BUILD_EXAMPLES=ON -D WITH_OPENGL=ON -D PYTHON_INCLUDE_DIR=/app/.heroku/python/include/python2.7 -D WITH_1394=OFF -D WITH_GSTREAMER=OFF -D WITH_FFMPEG=OFF ..
+cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/app/.heroku/opencv -D WITH_V4L=ON -D INSTALL_C_EXAMPLES=ON -D WITH_OPENGL=ON -D WITH_1394=OFF -D WITH_GSTREAMER=OFF -D WITH_FFMPEG=OFF ..
 make -j 4
 make install
 sh -c 'echo "/app/.heroku/opencv/lib" > /etc/ld.so.conf.d/opencv.conf'

README.md

@@ -1,10 +1,17 @@
 # NodeJS Docker Image with OpenCV 2.4
 
-This repository contains a NodeJS and OpenCV docker image, for use with [Heroku](http://heroku.com) and the
+This docker image has NodeJS, OpenCV and Tesseract for [Heroku](http://heroku.com) and the
 [heroku-docker](https://github.com/heroku/heroku-docker) CLI plugin.
 
-[Image available on Dockerhub](https://hub.docker.com/r/pastak/docker-heroku-nodejs-opencv/).
+[Image available on Dockerhub](https://hub.docker.com/r/hideyuki/docker-heroku-nodejs-opencv-tesseractv/).
 
-## Why it's not OpenCV 3 ?
 
-Related issue: https://github.com/peterbraden/node-opencv/issues/355
+```
+$ docker pull hideyuki/docker-heroku-nodejs-opencv-tesseract
+```
+
+## Versions
+
+- OpenCV: 2.4.13
+- Tesseract: 3.04.01
+