Merge pull request space-ros#204 from space-ros/203-remove-octomap_ms…

…gs-patch (fixes space-ros#203)

Remove upstreamed patch to `octomap_msgs`

moveit2/Dockerfile

@@ -134,10 +134,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   /bin/bash -c 'source ${SPACEROS_DIR}/install/setup.bash' \
  && rosdep install --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -r -y --skip-keys "console_bridge generate_parameter_library fastcdr fastrtps rti-connext-dds-5.3.1 urdfdom_headers rmw_connextdds ros_testing rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp composition demo_nodes_py lifecycle rosidl_typesupport_fastrtps_cpp rosidl_typesupport_fastrtps_c ikos diagnostic_aggregator diagnostic_updater joy qt_gui rqt_gui rqt_gui_py"
 
-# Apply a patch to octomap_msgs to work around a build issue
-COPY --chown=${USERNAME}:${USERNAME} octomap_fix.diff ./src/octomap_msgs
-RUN cd src/octomap_msgs && git apply octomap_fix.diff
-
 # Build MoveIt2
 RUN /bin/bash -c 'source ${SPACEROS_DIR}/install/setup.bash \
   && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON --event-handlers desktop_notification- status-'