From 98d2e831052c1dbcbbf014a95643d1d716a3805f Mon Sep 17 00:00:00 2001 From: Vladyslav Usenko Date: Tue, 28 Apr 2020 11:56:46 +0200 Subject: [PATCH] updated docker files --- docker/b_image/Dockerfile | 4 ++-- docker/b_image_focal/Dockerfile | 11 +++++++++++ scripts/clang-format-all.sh | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 docker/b_image_focal/Dockerfile diff --git a/docker/b_image/Dockerfile b/docker/b_image/Dockerfile index 22c3861..e051b82 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-9 main" > /etc/apt/sources.list.d/llvm9.list +RUN echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" > /etc/apt/sources.list.d/llvm10.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 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils doxygen graphviz libsuitesparse-dev clang-9 clang-format-9 +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 libsuitesparse-dev clang-10 clang-format-10 diff --git a/docker/b_image_focal/Dockerfile b/docker/b_image_focal/Dockerfile new file mode 100644 index 0000000..d7f4711 --- /dev/null +++ b/docker/b_image_focal/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:20.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/focal/ llvm-toolchain-focal-10 main" > /etc/apt/sources.list.d/llvm10.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 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils doxygen graphviz libsuitesparse-dev clang-10 clang-format-10 diff --git a/scripts/clang-format-all.sh b/scripts/clang-format-all.sh index 79b7bea..a51c886 100755 --- a/scripts/clang-format-all.sh +++ b/scripts/clang-format-all.sh @@ -9,7 +9,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" FOLDER="${1:-$SCRIPT_DIR/../include $SCRIPT_DIR/../src $SCRIPT_DIR/../test/src}" -CLANG_FORMAT_COMMANDS="clang-format-9 clang-format-8 clang-format" +CLANG_FORMAT_COMMANDS="clang-format-10 clang-format-9 clang-format-8 clang-format" # find the first available command: for CMD in $CLANG_FORMAT_COMMANDS; do