diff --git a/Dockerfile b/Dockerfile index eecbf04..c980ba2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,12 +18,13 @@ RUN rosdep update WORKDIR /ros_ws # ---------- Copy package.xml files ---------- -COPY toid_bot_description/package.xml toid_bot_description/package.xml -COPY toid_control/package.xml toid_control/package.xml -COPY toid_msgs/package.xml toid_msgs/package.xml -COPY toid_odometry/package.xml toid_odometry/package.xml +COPY toid_bot_description/package.xml toid_bot_description/package.xml +COPY toid_control/package.xml toid_control/package.xml +COPY toid_msgs/package.xml toid_msgs/package.xml +COPY toid_odometry/package.xml toid_odometry/package.xml COPY toid_spinner_controller/package.xml toid_spinner_controller/package.xml -#COPY toid_navigation/package.xml toid_navigation/package.xml +COPY toid_behaviors/package.xml toid_behaviors/package.xml +COPY toid_navigation/package.xml toid_navigation/package.xml # ---------- Install dependencies ---------- RUN . /opt/ros/jazzy/setup.sh && \ @@ -34,9 +35,9 @@ RUN rm -rf ./* RUN cat <> /root/.bashrc source /opt/ros/jazzy/setup.bash -if [[-f ./install/setup.bash ]] then; +if [[ -f ./install/setup.bash ]]; then source ./install/setup.bash -if +fi EOF diff --git a/toid_behaviors/package.xml b/toid_behaviors/package.xml index 270e4cc..4fafaa1 100644 --- a/toid_behaviors/package.xml +++ b/toid_behaviors/package.xml @@ -15,7 +15,7 @@ nav2_costmap_2d nav2_util nav2_core - nav2_controller + nav2_behaviors pluginlib tf2 tf2_geometry_msgs diff --git a/toid_navigation/package.xml b/toid_navigation/package.xml index 23e46aa..bbc8b60 100644 --- a/toid_navigation/package.xml +++ b/toid_navigation/package.xml @@ -14,7 +14,6 @@ nav2_controller nav2_bt_navigator nav2_lifecycle_manager - nav2_bringup ros2_control rsl