Merge branch 'master' into opencv_contrib

Author: janza

Dockerfile

@@ -1,8 +1,8 @@
 FROM python:3.7
 MAINTAINER Josip Janzic <josip@jjanzic.com>
 
-RUN apt-get update && \
-        apt-get install -y \
+RUN apt-get update \
+    && apt-get install -y \
         build-essential \
         cmake \
         git \
@@ -17,7 +17,8 @@ RUN apt-get update && \
         libpng-dev \
         libtiff-dev \
         libavformat-dev \
-        libpq-dev
+        libpq-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN pip install numpy
 
@@ -51,3 +52,6 @@ RUN wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip \
 && make install \
 && rm /${OPENCV_VERSION}.zip \
 && rm -r /opencv-${OPENCV_VERSION}
+RUN ln -s \
+  /usr/local/python/cv2/python-3.7/cv2.cpython-37m-x86_64-linux-gnu.so \
+  /usr/local/lib/python3.7/site-packages/cv2.so

README.md

@@ -1,6 +1,6 @@
 [![Docker Automated buil](https://img.shields.io/docker/automated/jjanzic/docker-python3-opencv.svg)]()
 
-Docker image with python 3.7 and opencv 4.0.1
+Docker image with python 3.7 and opencv 4.1.0
 
 Usage:
 
@@ -11,10 +11,14 @@ Image tagged with `:contrib` contains docker image built with [contrib modules](
 
 List of available docker tags:
 
-- `opencv-4.0.1` (`latest` branch)
-- `contrib-opencv-4.0.1` (`opencv_contrib` branch)
+- `opencv-4.1.0` (`latest` branch)
+- `contrib-opencv-4.1.0` (`opencv_contrib` branch)
+- `opencv-4.0.1`
+- `contrib-opencv-4.0.1`
 - `opencv-4.0.0`
 - `contrib-opencv-4.0.0`
+- `opencv-3.4.2`
+- `contrib-opencv-3.4.2`
 - `opencv-3.4.1`
 - `contrib-opencv-3.4.1`
 - `opencv-3.4.0`