From 92648c9f46682a3b9a2e7e07038db7d072185760 Mon Sep 17 00:00:00 2001 From: Vladyslav Usenko Date: Thu, 16 May 2019 16:01:37 +0200 Subject: [PATCH] update Docker images --- docker/b_image/Dockerfile | 5 ++++- docker/b_image_xenial/Dockerfile | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/docker/b_image/Dockerfile b/docker/b_image/Dockerfile index ac5897c..d1eeb21 100644 --- a/docker/b_image/Dockerfile +++ b/docker/b_image/Dockerfile @@ -5,4 +5,7 @@ RUN apt-get update && apt-get install -y wget gnupg RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - RUN echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" > /etc/apt/sources.list.d/llvm8.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 +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 diff --git a/docker/b_image_xenial/Dockerfile b/docker/b_image_xenial/Dockerfile index 38ceeec..6b9551f 100644 --- a/docker/b_image_xenial/Dockerfile +++ b/docker/b_image_xenial/Dockerfile @@ -2,16 +2,21 @@ FROM ubuntu:16.04 RUN apt-get update && apt-get install -y cmake git libtbb-dev libeigen3-dev libglew-dev ccache libjpeg-dev libpng12-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 wget libgtest-dev software-properties-common +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 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-7 +RUN gcc --version +RUN g++ --version + RUN wget https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh RUN chmod +x cmake-3.13.4-Linux-x86_64.sh RUN ./cmake-3.13.4-Linux-x86_64.sh --skip-license --prefix=/usr/local RUN update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force -RUN cmake --version - - -RUN add-apt-repository ppa:ubuntu-toolchain-r/test -RUN apt update && apt-get install -y g++-7 -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-7 -RUN gcc --version -RUN g++ --version +RUN cmake --version \ No newline at end of file