From 7b90fa35adb59f9249e8bedea70b3d2c36c60edd Mon Sep 17 00:00:00 2001 From: Vladyslav Usenko Date: Fri, 8 Nov 2019 23:48:03 +0800 Subject: [PATCH] Update docker --- doc/DevSetup.md | 6 +++--- docker/b_image/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/DevSetup.md b/doc/DevSetup.md index 8b4450e..429b0f6 100644 --- a/doc/DevSetup.md +++ b/doc/DevSetup.md @@ -3,12 +3,12 @@ ### Clang-format We use clang-format to maintain a consistent formating of the code. Since there are small differences between different version of clang-format we use version 8 on all platforms. -On **Ubuntu 18.04** run the following commands to install clang-format-8 +On **Ubuntu 18.04** run the following commands to install clang-format-9 ``` wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" > /etc/apt/sources.list.d/llvm8.list' +sudo sh -c 'echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" > /etc/apt/sources.list.d/llvm9.list' sudo apt-get update -sudo apt-get install clang-format-8 +sudo apt-get install clang-format-9 ``` On **MacOS** [Homebrew](https://brew.sh/) should install the right version of clang-format: diff --git a/docker/b_image/Dockerfile b/docker/b_image/Dockerfile index f4d4df8..210e5ac 100644 --- a/docker/b_image/Dockerfile +++ b/docker/b_image/Dockerfile @@ -3,9 +3,9 @@ FROM ubuntu:18.04 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 echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" > /etc/apt/sources.list.d/llvm9.list 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 librealsense2-gl-dev librealsense2-dkms librealsense2-utils doxygen graphviz clang-8 +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 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils doxygen graphviz suitsparse libsuitesparse-dev libgoogle-glog-dev clang-9 clang-format-9