diff --git a/Dockerfile b/Dockerfile
index cd14acf935853d62c1f53fa9f23e9952107f8ded..4cf621dc8c95ac3ca24feea914cca46b29b5fab5 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 bdaa1487a963a14f2a51eab99800d9573712c548..1e407c85b6e309d59ccd04ddd2e70605480d7bf7 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 \