From 037f9341a5d07b1195a3cbab3dc292c2c0354521 Mon Sep 17 00:00:00 2001
From: rafal-gorecki <126687345+rafal-gorecki@users.noreply.github.com>
Date: Tue, 6 Feb 2024 01:14:16 +0100
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a694fd..13fceb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /ros2_ws
 
 COPY ./husarion_utils/healthcheck.cpp /husarion_utils/healthcheck.cpp
 COPY ./husarion_utils/CMakeList.txt /husarion_utils/CMakeList.txt
-COPY ./husarion_utils/package.txt /husarion_utils/package.txt
+COPY ./husarion_utils/package.xml /husarion_utils/package.xml
 
 # In version 1.0.12 MPPI doesn't work on RPi4 (build from source)
 # Install everything needed
@@ -33,13 +33,13 @@ RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
     mv /husarion_utils/healthcheck.cpp /ros2_ws/src/healthcheck_pkg/src/ && \
     cd .. && \
     # Install dependencies
+    mv /husarion_utils/CMakeList.txt src/navigation2/nav2_mppi_controller/CMakeList.txt && \
+    mv /husarion_utils/package.xml src/navigation2/nav2_mppi_controller/package.xml && \
     rm -rf /etc/ros/rosdep/sources.list.d/20-default.list && \
     rosdep init && \
     rosdep update --rosdistro $ROS_DISTRO && \
     rosdep install -i --from-path src --rosdistro $ROS_DISTRO -y && \
     # Build
-    mv /husarion_utils/CMakeList.txt src/navigation2/nav2_mppi_controller/CMakeList.txt && \
-    mv /husarion_utils/package.xml src/navigation2/nav2_mppi_controller/package.xml && \
     colcon build --event-handlers console_direct+ --cmake-args -DBUILD_TESTING=OFF && \
     # Save version
     echo $(dpkg -s ros-$ROS_DISTRO-navigation2 | grep 'Version' | sed -r 's/Version:\s([0-9]+.[0-9]+.[0-9]+).*/\1/g') > /version.txt && \