diff --git a/Dockerfile b/Dockerfile index c4e26e1a..0f5ab6fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,8 @@ RUN apt-get update && \ unrar \ p7zip-full \ vim && \ + add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \ + add-apt-repository --remove ppa:mc3man/xerus-media -y && \ rm -rf /var/lib/apt/lists/* # Add a non-root user diff --git a/components/openvino/install.sh b/components/openvino/install.sh index cfa363db..54e87418 100755 --- a/components/openvino/install.sh +++ b/components/openvino/install.sh @@ -16,19 +16,15 @@ if [[ `lscpu | grep -o "sse4" | head -1` != "sse4" ]] && [[ `lscpu | grep -o "av exit 1 fi -apt update && apt install -y libpng12-dev libcairo2-dev \ - libpango1.0-dev libglib2.0-dev libgtk2.0-dev \ - libgstreamer0.10-dev libswscale-dev \ - libavcodec-dev libavformat-dev cmake libusb-1.0-0-dev cpio - -# OpenCV which included into OpenVino toolkit was compiled with other version ffmpeg -# Need to install these packages for it works -apt install -y libavcodec-ffmpeg56 libavformat-ffmpeg56 libswscale-ffmpeg3 cd /tmp/components/openvino + tar -xzf `ls | grep "openvino_toolkit"` cd `ls -d */ | grep "openvino_toolkit"` +apt-get update && apt-get install -y sudo cpio && \ + ./install_cv_sdk_dependencies.sh && SUDO_FORCE_REMOVE=yes apt-get remove -y sudo + cat ../eula.cfg >> silent.cfg ./install.sh -s silent.cfg