Skip to content

Commit 981485a

Browse files
committed
🐋 gazebo harmonic
1 parent 46949d4 commit 981485a

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

docker/dockerfile-suave

+13-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pk
4343
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null
4444

4545
RUN apt update && apt install -y \
46-
gz-garden \
46+
# gz-garden \
47+
gz-harmonic \
4748
&& rm -rf /var/lib/apt/lists/
4849

4950
RUN pip uninstall empy && pip install empy==3.3.4 && pip install -U colcon-common-extensions
@@ -72,7 +73,7 @@ WORKDIR $HOME
7273
# Install ArduSub
7374
RUN git clone https://github.com/ArduPilot/ardupilot.git
7475
WORKDIR $HOME/ardupilot
75-
RUN git checkout ab597cb
76+
RUN git checkout 2dd0bb7d4c85ac48437f139d66df648fc0e1d4ae
7677
RUN git submodule update --init --recursive
7778
RUN rm $HOME/ardupilot/Tools/environment_install/install-prereqs-ubuntu.sh
7879
RUN wget -P $HOME/ardupilot/Tools/environment_install/ https://raw.githubusercontent.com/ArduPilot/ardupilot/c623ae8b82db4d7e195f4b757e2ae5d049f941e5/Tools/environment_install/install-prereqs-ubuntu.sh
@@ -90,13 +91,20 @@ RUN ["/bin/bash","-c","./waf configure && make sub"]
9091
# install ardupilot gazebo plugin
9192
RUN sudo apt update && sudo apt install -y \
9293
rapidjson-dev \
93-
libgz-sim7-dev \
94+
# libgz-sim7-dev \
95+
libgz-sim8-dev \
96+
libopencv-dev \
97+
libgstreamer1.0-dev \
98+
libgstreamer-plugins-base1.0-dev \
99+
gstreamer1.0-plugins-bad \
100+
gstreamer1.0-libav \
101+
gstreamer1.0-gl \
94102
&& sudo rm -rf /var/lib/apt/list/
95103

96104
WORKDIR $HOME
97105
RUN git clone https://github.com/ArduPilot/ardupilot_gazebo
98106

99-
ENV GZ_VERSION=garden
107+
ENV GZ_VERSION=harmonic
100108
RUN ["/bin/bash", "-c", "source /opt/ros/humble/setup.bash \
101109
&& sudo rosdep init \
102110
&& sudo wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list -O /etc/ros/rosdep/sources.list.d/00-gazebo.list \
@@ -112,7 +120,7 @@ ENV GZ_SIM_SYSTEM_PLUGIN_PATH=$HOME/ardupilot_gazebo/build:${GZ_SIM_SYSTEM_PLUGI
112120
ENV GZ_SIM_RESOURCE_PATH=$HOME/ardupilot_gazebo/models:$HOME/ardupilot_gazebo/worlds:${GZ_SIM_RESOURCE_PATH}
113121

114122
# Copy suave files
115-
ENV GZ_VERSION=garden
123+
ENV GZ_VERSION=harmonic
116124
RUN mkdir -p $HOME/suave_ws/src
117125
COPY --chown=kasm-user:kasm-user suave.rosinstall $HOME/suave_ws/suave.rosinstall
118126
WORKDIR $HOME/suave_ws/

0 commit comments

Comments
 (0)