Merge pull request #1 from ptqa/master

Update to python 3.6 and opencv 3.2.0

Author: janza

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.6
 MAINTAINER Josip Janzic <josip.janzic@gmail.com>
 
 RUN apt-get update && \
@@ -23,10 +23,10 @@ RUN apt-get update && \
 RUN pip install numpy
 
 WORKDIR /
-RUN wget https://github.com/Itseez/opencv/archive/3.1.0.zip \
-&& unzip 3.1.0.zip \
-&& mkdir /opencv-3.1.0/cmake_binary \
-&& cd /opencv-3.1.0/cmake_binary \
+RUN wget https://github.com/Itseez/opencv/archive/3.2.0.zip \
+&& unzip 3.2.0.zip \
+&& mkdir /opencv-3.2.0/cmake_binary \
+&& cd /opencv-3.2.0/cmake_binary \
 && cmake -DBUILD_TIFF=ON \
   -DBUILD_opencv_java=OFF \
   -DWITH_CUDA=OFF \
@@ -40,12 +40,12 @@ RUN wget https://github.com/Itseez/opencv/archive/3.1.0.zip \
   -DBUILD_TESTS=OFF \
   -DBUILD_PERF_TESTS=OFF \
   -DCMAKE_BUILD_TYPE=RELEASE \
-  -DCMAKE_INSTALL_PREFIX=$(python3.5 -c "import sys; print(sys.prefix)") \
-  -DPYTHON_EXECUTABLE=$(which python3.5) \
-  -DPYTHON_INCLUDE_DIR=$(python3.5 -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
-  -DPYTHON_PACKAGES_PATH=$(python3.5 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") .. \
+  -DCMAKE_INSTALL_PREFIX=$(python3.6 -c "import sys; print(sys.prefix)") \
+  -DPYTHON_EXECUTABLE=$(which python3.6) \
+  -DPYTHON_INCLUDE_DIR=$(python3.6 -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
+  -DPYTHON_PACKAGES_PATH=$(python3.6 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") .. \
 && make install \
-&& rm /3.1.0.zip \
-&& rm -r /opencv-3.1.0
+&& rm /3.2.0.zip \
+&& rm -r /opencv-3.2.0
 
 RUN pip install flake8 pep8 --upgrade