From e6e58f6fef7dbad09eecb5b599b94642b0c74a0e Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Fri, 6 Aug 2021 10:09:51 +0200 Subject: [PATCH] Update docker images --- docker/b_image_bionic/Dockerfile | 8 ++++---- docker/b_image_focal/Dockerfile | 8 ++++---- docker/b_image_xenial/Dockerfile | 9 +++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docker/b_image_bionic/Dockerfile b/docker/b_image_bionic/Dockerfile index 97bd032..96c3a8f 100644 --- a/docker/b_image_bionic/Dockerfile +++ b/docker/b_image_bionic/Dockerfile @@ -1,12 +1,12 @@ FROM ubuntu:18.04 -RUN apt-get update && apt-get install -y wget gnupg +RUN apt-get update && apt-get install -y wget gnupg lsb-release software-properties-common && apt-get clean all 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-11 main" > /etc/apt/sources.list.d/llvm11.list RUN echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main" > /etc/apt/sources.list.d/llvm12.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-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE +RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" -u -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-11 clang-format-11 clang-tidy-11 clang-12 clang-format-12 clang-tidy-12 +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-11 clang-format-11 clang-tidy-11 clang-12 clang-format-12 clang-tidy-12 && apt-get clean all diff --git a/docker/b_image_focal/Dockerfile b/docker/b_image_focal/Dockerfile index 7ac0c33..542efd5 100644 --- a/docker/b_image_focal/Dockerfile +++ b/docker/b_image_focal/Dockerfile @@ -1,12 +1,12 @@ FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y wget gnupg +RUN apt-get update && apt-get install -y wget gnupg lsb-release software-properties-common && apt-get clean all 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-11 main" > /etc/apt/sources.list.d/llvm11.list RUN echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main" > /etc/apt/sources.list.d/llvm12.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-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE +RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" -u -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-11 clang-format-11 clang-tidy-11 clang-12 clang-format-12 clang-tidy-12 +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-11 clang-format-11 clang-tidy-11 clang-12 clang-format-12 clang-tidy-12 && apt-get clean all diff --git a/docker/b_image_xenial/Dockerfile b/docker/b_image_xenial/Dockerfile index 709b3c5..5d77879 100644 --- a/docker/b_image_xenial/Dockerfile +++ b/docker/b_image_xenial/Dockerfile @@ -1,13 +1,14 @@ 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 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 lsb-release software-properties-common && apt-get clean all 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-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE +RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" -u -RUN apt update && apt-get install -y g++-7 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils + +RUN apt update && apt-get install -y g++-7 librealsense2-dev librealsense2-gl-dev librealsense2-dkms librealsense2-utils && apt-get clean all RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 \