Skip to content

Commit

Permalink
Set GZ_VERSION before compiling ardupilot_gazebo, alternate fix for #26
Browse files Browse the repository at this point in the history
  • Loading branch information
clydemcqueen committed May 26, 2024
1 parent d307595 commit e0e1f9a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ RUN modules/waf/waf-light configure --board sitl \
WORKDIR /home/$USERNAME
RUN git clone https://github.com/ArduPilot/ardupilot_gazebo.git

# Build for Gazebo Garden, define this before building ardupilot_gazebo and ros_gz
ENV GZ_VERSION=garden

# Build ardupilot_gazebo
RUN [ "/bin/bash" , "-c" , " \
cd ardupilot_gazebo \
Expand All @@ -110,9 +113,6 @@ COPY --chown=$USER_UID:$USER_GID workspace.repos colcon_ws/src/orca4
WORKDIR /home/$USERNAME/colcon_ws/src
RUN vcs import < orca4/workspace.repos

# Build for Gazebo Garden
ENV GZ_VERSION=garden

# Run rosdep over workspace repos
# Note: ros_gz asks for some Gazebo Garden keys which are not yet present in rosdistro.
# This is fine, since Gazebo Garden has already been installed.
Expand Down

0 comments on commit e0e1f9a

Please sign in to comment.