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 <[email protected]>
Ekumen-OS · Aug 30, 2023 · c0e2de1 · c0e2de1
1 parent ff0d4ed
commit c0e2de1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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