Merge tag 'opencv-4.0.0' into opencv_contrib

Author: janza

Dockerfile

@@ -22,7 +22,7 @@ RUN apt-get update && \
 RUN pip install numpy
 
 WORKDIR /
-ENV OPENCV_VERSION="3.4.2"
+ENV OPENCV_VERSION="4.0.0"
 RUN wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip \
 && unzip ${OPENCV_VERSION}.zip \
 && rm ${OPENCV_VERSION}.zip
@@ -34,7 +34,6 @@ RUN wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip \
   -DBUILD_opencv_java=OFF \
   -DOPENCV_EXTRA_MODULES_PATH=/opencv_contrib-${OPENCV_VERSION}/modules \
   -DWITH_CUDA=OFF \
-  -DENABLE_AVX=ON \
   -DWITH_OPENGL=ON \
   -DWITH_OPENCL=ON \
   -DWITH_IPP=ON \

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.6 and opencv 3.4.1
+Docker image with python 3.6 and opencv 4.0.0
 
 Usage:
 
@@ -11,8 +11,10 @@ Image tagged with `:contrib` contains docker image built with [contrib modules](
 
 List of available docker tags:
 
-- `opencv-3.4.1` (`latest` branch)
-- `contrib-opencv-3.4.1` (`opencv_contrib` branch)
+- `opencv-4.0.0` (`latest` branch)
+- `contrib-opencv-4.0.0` (`opencv_contrib` branch)
+- `opencv-3.4.1`
+- `contrib-opencv-3.4.1`
 - `opencv-3.4.0`
 - `contrib-opencv-3.4.0`
 - `opencv-3.3.0`