From 28df7d1a698737e27710a3e99025d1e6cc2326d3 Mon Sep 17 00:00:00 2001 From: CihatAltiparmak Date: Sat, 4 Jan 2025 22:27:11 +0300 Subject: [PATCH 1/2] Clone the upstream repositories of navigation2 repo Signed-off-by: CihatAltiparmak --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 749293f..c9fbaf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,14 @@ WORKDIR /root/nav2_ws RUN mkdir -p ~/nav2_ws/src ARG VERSION_TAG=latest RUN if [ "${ROS_DISTRO}" = "rolling" ]; then \ - git clone https://github.com/ros-planning/navigation2.git --branch main ./src/navigation2; \ + git clone https://github.com/ros-planning/navigation2.git --branch main ./src/navigation2 && \ + vcs import ./src/ < ./src/navigation2/tools/underlay.repos; \ elif [ "${VERSION_TAG}" = "latest" ]; then \ - git clone https://github.com/ros-planning/navigation2.git --branch ${ROS_DISTRO} ./src/navigation2; \ + git clone https://github.com/ros-planning/navigation2.git --branch ${ROS_DISTRO} ./src/navigation2 && \ + vcs import ./src/ < ./src/navigation2/tools/underlay.repos; \ else \ - git clone https://github.com/ros-planning/navigation2.git --branch ${VERSION_TAG} ./src/navigation2; \ + git clone https://github.com/ros-planning/navigation2.git --branch ${VERSION_TAG} ./src/navigation2 && \ + vcs import ./src/ < ./src/navigation2/tools/underlay.repos; \ fi RUN rm /etc/ros/rosdep/sources.list.d/20-default.list && rosdep init From 348797cc85057560d18f9b15aa1ccdcd69979143 Mon Sep 17 00:00:00 2001 From: CihatAltiparmak Date: Sun, 5 Jan 2025 16:38:21 +0300 Subject: [PATCH 2/2] Remove installing upstream packages from source except rolling Signed-off-by: CihatAltiparmak --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9fbaf5..2e288d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,11 +14,9 @@ RUN if [ "${ROS_DISTRO}" = "rolling" ]; then \ git clone https://github.com/ros-planning/navigation2.git --branch main ./src/navigation2 && \ vcs import ./src/ < ./src/navigation2/tools/underlay.repos; \ elif [ "${VERSION_TAG}" = "latest" ]; then \ - git clone https://github.com/ros-planning/navigation2.git --branch ${ROS_DISTRO} ./src/navigation2 && \ - vcs import ./src/ < ./src/navigation2/tools/underlay.repos; \ + git clone https://github.com/ros-planning/navigation2.git --branch ${ROS_DISTRO} ./src/navigation2; \ else \ - git clone https://github.com/ros-planning/navigation2.git --branch ${VERSION_TAG} ./src/navigation2 && \ - vcs import ./src/ < ./src/navigation2/tools/underlay.repos; \ + git clone https://github.com/ros-planning/navigation2.git --branch ${VERSION_TAG} ./src/navigation2; \ fi RUN rm /etc/ros/rosdep/sources.list.d/20-default.list && rosdep init