From 22391317c0c6640cefac9b1c5e3ae4e2835c8262 Mon Sep 17 00:00:00 2001 From: Clyde McQueen Date: Sun, 5 Jan 2025 10:33:02 -0800 Subject: [PATCH] Support the latest version of ardupilot_gazebo --- docker/Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5e2dd37..5c1c367 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,12 +46,19 @@ ENV NVIDIA_VISIBLE_DEVICES=all ENV NVIDIA_DRIVER_CAPABILITIES=graphics,utility,compute ENV QT_X11_NO_MITSHM=1 -# Install some ardupilot and ardupilot_gazebo prereqs +# Install some ardupilot and ardupilot_gazebo prereqs (libgz-sim7-dev is for gz garden) RUN apt-get update \ - && apt-get -y --quiet --no-install-recommends install \ + && apt-get -y --quiet --no-install-recommends install \ python3-wxgtk4.0 \ rapidjson-dev \ xterm \ + libgz-sim7-dev \ + libopencv-dev \ + libgstreamer1.0-dev \ + libgstreamer-plugins-base1.0-dev \ + gstreamer1.0-plugins-bad \ + gstreamer1.0-libav \ + gstreamer1.0-gl \ && rm -rf /var/lib/apt/lists/* # Create a non-root user @@ -94,7 +101,7 @@ ENV GZ_VERSION=garden # Build ardupilot_gazebo RUN [ "/bin/bash" , "-c" , " \ cd ardupilot_gazebo \ - && git checkout 4945088 \ + && git checkout 4b30a3d8 \ && mkdir build \ && cd build \ && cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \