From 675a24aa8b9c40517dca7f833d7ed1cd67817047 Mon Sep 17 00:00:00 2001 From: Bartosz Burda Date: Thu, 19 Mar 2026 18:19:29 +0100 Subject: [PATCH] fix: use ros2_medkit_cmake package instead of copying cmake dir The shared cmake modules are now a proper ament package (ros2_medkit_cmake) instead of a loose cmake/ directory. Replace `cp -r ros2_medkit/cmake` with `mv ros2_medkit/src/ros2_medkit_cmake .` in all Dockerfiles. See: selfpatch/ros2_medkit#295 --- demos/moveit_pick_place/Dockerfile | 4 ++-- demos/sensor_diagnostics/Dockerfile | 2 +- demos/turtlebot3_integration/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demos/moveit_pick_place/Dockerfile b/demos/moveit_pick_place/Dockerfile index 3e36402..6d8afcc 100644 --- a/demos/moveit_pick_place/Dockerfile +++ b/demos/moveit_pick_place/Dockerfile @@ -46,8 +46,8 @@ RUN git clone --depth 1 --branch ${ROS2_MEDKIT_REF} https://github.com/selfpatch ros2_medkit/src/ros2_medkit_serialization \ ros2_medkit/src/ros2_medkit_fault_manager \ ros2_medkit/src/ros2_medkit_fault_reporter \ - ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \ - cp -r ros2_medkit/cmake ${COLCON_WS}/ && \ + ros2_medkit/src/ros2_medkit_diagnostic_bridge \ + ros2_medkit/src/ros2_medkit_cmake . && \ rm -rf ros2_medkit # Copy demo package from local context diff --git a/demos/sensor_diagnostics/Dockerfile b/demos/sensor_diagnostics/Dockerfile index 516b43e..0966fbd 100644 --- a/demos/sensor_diagnostics/Dockerfile +++ b/demos/sensor_diagnostics/Dockerfile @@ -32,7 +32,7 @@ RUN git clone --depth 1 https://github.com/selfpatch/ros2_medkit.git && \ mv ros2_medkit/src/ros2_medkit_fault_manager . && \ mv ros2_medkit/src/ros2_medkit_fault_reporter . && \ mv ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \ - cp -r ros2_medkit/cmake ${COLCON_WS}/ && \ + mv ros2_medkit/src/ros2_medkit_cmake . && \ rm -rf ros2_medkit # Copy demo package diff --git a/demos/turtlebot3_integration/Dockerfile b/demos/turtlebot3_integration/Dockerfile index af182f3..dd5e752 100644 --- a/demos/turtlebot3_integration/Dockerfile +++ b/demos/turtlebot3_integration/Dockerfile @@ -52,7 +52,7 @@ RUN git clone --depth 1 https://github.com/selfpatch/ros2_medkit.git && \ mv ros2_medkit/src/ros2_medkit_fault_manager . && \ mv ros2_medkit/src/ros2_medkit_fault_reporter . && \ mv ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \ - cp -r ros2_medkit/cmake ${COLCON_WS}/ && \ + mv ros2_medkit/src/ros2_medkit_cmake . && \ rm -rf ros2_medkit # Copy demo package from local context (this repo)