From ae199327fe407b85af77381a0317e30ae47f38d1 Mon Sep 17 00:00:00 2001 From: Vladyslav Usenko Date: Thu, 13 Jun 2019 16:17:55 +0200 Subject: [PATCH] updated docker images --- CMakeLists.txt | 2 +- docker/b_image/Dockerfile | 2 +- docker/b_image_xenial/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da82b8a..50477b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ if(LSB_RELEASE_PROGRAM) set(DEBIAN_DEPENDS "libtbb2, liblz4-1, libbz2-1.0, libboost-filesystem1.65.1, libboost-date-time1.65.1, libboost-program-options1.65.1, libboost-regex1.65.1, libopencv-dev, libglew2.0, libjpeg8, libpng16-16, librealsense2, librealsense2-dkms, librealsense2-gl, librealsense2-utils") elseif(${LSB_RELEASE_ID_SHORT} EQUAL "16.04") - set(DEBIAN_DEPENDS "libtbb2, liblz4-1, libbz2-1.0, libboost-filesystem1.58.0, libboost-date-time1.58.0, libboost-program-options1.58.0, libboost-regex1.58.0, libopencv-dev, libglew1.13, libjpeg8, libpng12-0, libstdc++6, , librealsense2, librealsense2-dkms, librealsense2-gl, librealsense2-utils") + set(DEBIAN_DEPENDS "libtbb2, liblz4-1, libbz2-1.0, libboost-filesystem1.58.0, libboost-date-time1.58.0, libboost-program-options1.58.0, libboost-regex1.58.0, libopencv-dev, libglew1.13, libjpeg8, libpng12-0, libstdc++6, librealsense2, librealsense2-dkms, librealsense2-gl, librealsense2-utils") endif() endif(LSB_RELEASE_PROGRAM) diff --git a/docker/b_image/Dockerfile b/docker/b_image/Dockerfile index d1eeb21..74d26d5 100644 --- a/docker/b_image/Dockerfile +++ b/docker/b_image/Dockerfile @@ -8,4 +8,4 @@ RUN echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" > /etc/a RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C8B3A55A6F3EFCDE RUN echo "deb http://realsense-hw-public.s3.amazonaws.com/Debian/apt-repo bionic main" > /etc/apt/sources.list.d/realsense.list -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y cmake git libtbb-dev libeigen3-dev libglew-dev ccache libjpeg-dev libpng-dev openssh-client liblz4-dev libbz2-dev libboost-regex-dev libboost-filesystem-dev libboost-date-time-dev libboost-program-options-dev libopencv-dev libpython2.7-dev libgtest-dev lsb-core gcovr ggcov lcov clang-format-8 librealsense2-dev +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y cmake git libtbb-dev libeigen3-dev libglew-dev ccache libjpeg-dev libpng-dev openssh-client liblz4-dev libbz2-dev libboost-regex-dev libboost-filesystem-dev libboost-date-time-dev libboost-program-options-dev libopencv-dev libpython2.7-dev libgtest-dev lsb-core gcovr ggcov lcov clang-format-8 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils diff --git a/docker/b_image_xenial/Dockerfile b/docker/b_image_xenial/Dockerfile index 6b9551f..709b3c5 100644 --- a/docker/b_image_xenial/Dockerfile +++ b/docker/b_image_xenial/Dockerfile @@ -7,7 +7,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C8B3A55A6F3EFCDE RUN echo "deb http://realsense-hw-public.s3.amazonaws.com/Debian/apt-repo xenial main" > /etc/apt/sources.list.d/realsense.list -RUN apt update && apt-get install -y g++-7 librealsense2-dev +RUN apt update && apt-get install -y g++-7 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 \