From c0e2de14c6a8eac9c5353cc56339d9975bc0ea19 Mon Sep 17 00:00:00 2001 From: Gerardo Puga Date: Wed, 30 Aug 2023 17:01:36 -0300 Subject: [PATCH] Fix glx error issue starting rviz in Noetic/20.04 (#252) ### Proposed changes - Fixes #250 - Removes the temporary fixes for #123 , since they don't seem to be necessary anymore Signed-off-by: Gerardo Puga --- docker/docker-compose.yml | 2 ++ docker/images/humble/Dockerfile | 12 ------------ docker/images/iron/Dockerfile | 12 ------------ docker/images/rolling/Dockerfile | 12 ------------ 4 files changed, 2 insertions(+), 36 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2b3c30c0e..6c6724a1c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,5 +18,7 @@ services: - /tmp/.docker.xauth:/tmp/.docker.xauth - ..:/ws/src/beluga - beluga_ccache:/home/developer/.ccache + devices: + - /dev/dri:/dev/dri volumes: beluga_ccache: diff --git a/docker/images/humble/Dockerfile b/docker/images/humble/Dockerfile index 953bb8bcb..6c66548c7 100644 --- a/docker/images/humble/Dockerfile +++ b/docker/images/humble/Dockerfile @@ -52,18 +52,6 @@ RUN apt-get update \ tmux \ && rm -rf /var/lib/apt/lists/* -# Fix for the RViz black screen issue. -# TODO(nahuel): Remove this when the Mesa version available -# in Ubuntu 22.04 is 22.3.5 or greater. -# See https://github.com/Ekumen-OS/beluga/issues/123 -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - software-properties-common \ - && add-apt-repository -y ppa:kisak/kisak-mesa \ - && apt-get install --no-install-recommends -y \ - libegl-mesa0 libglx-mesa0 \ - && rm -rf /var/lib/apt/lists/* - RUN pip install \ evo==1.21.0 \ pre-commit==2.20.0 diff --git a/docker/images/iron/Dockerfile b/docker/images/iron/Dockerfile index 3944c89b7..94c3cf60a 100644 --- a/docker/images/iron/Dockerfile +++ b/docker/images/iron/Dockerfile @@ -52,18 +52,6 @@ RUN apt-get update \ tmux \ && rm -rf /var/lib/apt/lists/* -# Fix for the RViz black screen issue. -# TODO(nahuel): Remove this when the Mesa version available -# in Ubuntu 22.04 is 22.3.5 or greater. -# See https://github.com/Ekumen-OS/beluga/issues/123 -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - software-properties-common \ - && add-apt-repository -y ppa:kisak/kisak-mesa \ - && apt-get install --no-install-recommends -y \ - libegl-mesa0 libglx-mesa0 \ - && rm -rf /var/lib/apt/lists/* - RUN pip install \ evo==1.21.0 \ pre-commit==2.20.0 diff --git a/docker/images/rolling/Dockerfile b/docker/images/rolling/Dockerfile index 8b6e6856e..982c24d99 100644 --- a/docker/images/rolling/Dockerfile +++ b/docker/images/rolling/Dockerfile @@ -52,18 +52,6 @@ RUN apt-get update \ tmux \ && rm -rf /var/lib/apt/lists/* -# Fix for the RViz black screen issue. -# TODO(nahuel): Remove this when the Mesa version available -# in Ubuntu 22.04 is 22.3.5 or greater. -# See https://github.com/Ekumen-OS/beluga/issues/123 -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - software-properties-common \ - && add-apt-repository -y ppa:kisak/kisak-mesa \ - && apt-get install --no-install-recommends -y \ - libegl-mesa0 libglx-mesa0 \ - && rm -rf /var/lib/apt/lists/* - RUN pip install \ evo==1.21.0 \ pre-commit==2.20.0