diff --git a/docker/Dockerfile-Ubuntu-16.04 b/docker/Dockerfile-Ubuntu-16.04 index 7857963d..f54dbd27 100644 --- a/docker/Dockerfile-Ubuntu-16.04 +++ b/docker/Dockerfile-Ubuntu-16.04 @@ -2,7 +2,7 @@ FROM ubuntu:16.04 # Install all needed packages RUN apt-get update && apt-get install -y \ - build-essential checkinstall yasm gfortran \ + build-essential \ apt-utils software-properties-common \ python3-pip python3-dev \ libgstreamer1.0-0 gstreamer1.0-plugins-base \ @@ -12,52 +12,22 @@ RUN apt-get update && apt-get install -y \ gstreamer1.0-doc gstreamer1.0-tools gstreamer1.0-x \ cmake cpputest automake libtool pkg-config \ unzip doxygen libgtk2.0-dev \ - libavcodec-dev libavformat-dev libswscale-dev \ - libxine2-dev libv4l-dev \ - libtbb2 libtbb-dev \ - libjpeg8-dev libjasper-dev libpng12-dev \ - libtiff-dev libtiff5-dev \ - libdc1394-22-dev libprotobuf-dev protobuf-compiler \ - libatlas-base-dev libfaac-dev libmp3lame-dev libtheora-dev \ - libvorbis-dev libxvidcore-dev \ wget vim \ - && rm -rf /var/lib/apt/lists/* \ - && pip3 install meson ninja numpy + libcv2.4 libopencv-contrib-dev libopencv-contrib2.4v5 \ + libopencv-core-dev libopencv-core2.4v5 libopencv-dev \ + libopencv-highgui-dev libopencv-highgui2.4v5 \ + libopencv-imgproc-dev libopencv-imgproc2.4v5 \ + libopencv-legacy-dev libopencv-legacy2.4v5 \ + libopencv-video-dev libopencv-video2.4v5 + +RUN rm -rf /var/lib/apt/lists/* \ + && pip3 install meson ninja numpy # Install latest git version RUN apt-add-repository ppa:git-core/ppa \ && apt-get update \ && apt-get install -y git -# Download and build OpenCV 3.4.10 -RUN cd \ - && wget https://github.com/opencv/opencv/archive/3.4.10.zip \ - && unzip 3.4.10.zip \ - && rm 3.4.10.zip \ - && wget https://github.com/opencv/opencv_contrib/archive/3.4.10.zip \ - && unzip 3.4.10.zip \ - && rm 3.4.10.zip \ - && cd opencv-3.4.10 \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_BUILD_TYPE=RELEASE \ - -DCMAKE_INSTALL_PREFIX=/usr/local \ - -DINSTALL_C_EXAMPLES=OFF \ - -DBUILD_opencv_python=OFF \ - -DBUILD_opencv_python2=OFF \ - -DBUILD_opencv_python3=OFF \ - -DINSTALL_PYTHON_EXAMPLES=OFF \ - -DBUILD_opencv_java=OFF \ - -DWITH_TBB=ON \ - -DWITH_V4L=OFF \ - -DWITH_QT=OFF \ - -DWITH_OPENGL=OFF \ - -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-3.4.10/modules \ - -DBUILD_EXAMPLES=OFF .. \ - && make -j8 \ - && make install \ - && cd - # Copy tar package with tensorflow and tensorflow lite dependencies COPY r2inference-dependencies-linux-x86_64-v0.1.0.tar.gz /root