From fdfb007981c88b3c0da26fd54c714f9acf9246cf Mon Sep 17 00:00:00 2001 From: Tim Kluge <timklge@gmail.com> Date: Mon, 11 May 2020 14:40:03 +0200 Subject: [PATCH] Add swrast mesa package to dockerfile, X11 dri setting for Mac OS setup --- Dockerfile | 3 ++- docker-run-mac.sh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd14acf..4cf621d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ RUN useradd -m $USERNAME && \ groupmod --gid $gid $USERNAME RUN apt-get update && apt-get install -y \ - python-catkin-tools bash + python-catkin-tools bash \ + mesa-utils libgl1-mesa-glx WORKDIR /home/$USERNAME COPY src /home/$USERNAME/src RUN rosdep install --from-paths . -r -y diff --git a/docker-run-mac.sh b/docker-run-mac.sh index bdaa148..1e407c8 100644 --- a/docker-run-mac.sh +++ b/docker-run-mac.sh @@ -4,8 +4,12 @@ docker build . -t ceti-panda-gazebo-workspace XSOCK=/tmp/.X11-unix +/usr/X11/bin/xhost + 127.0.0.1 +defaults write org.macosforge.xquartz.X11 enable_iglx -bool true + docker run -it \ --volume=$XSOCK:$XSOCK:rw \ + --env="LIBGL_ALWAYS_INDIRECT=1" \ --env="DISPLAY=host.docker.internal:0" \ --user="ros" \ ceti-panda-gazebo-workspace \ -- GitLab