Merge tag 'opencv-4.0.0'

janza · Nov 20, 2018 · dd3d3b0 · dd3d3b0
2 parents b7f3c27 + 7ed688d
commit dd3d3b0
Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Dockerfile b/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/archive/${OPENCV_VERSION}.zip \
 && unzip ${OPENCV_VERSION}.zip \
 && mkdir /opencv-${OPENCV_VERSION}/cmake_binary \

diff --git a/README.md b/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 3.4.2
+Docker image with python 3.7 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.2` (`latest` branch)
-- `contrib-opencv-3.4.2` (`opencv_contrib` branch)
+- `opencv-4.0.0` (`latest` branch)
+- `contrib-opencv-4.0.0` (`opencv_contrib` branch)
+- `opencv-3.4.2`
+- `contrib-opencv-3.4.2`
 - `opencv-3.4.1`
 - `contrib-opencv-3.4.1`
 - `opencv-3.4.0`