Skip to content

Commit e3828ee

Browse files
committed
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
1 parent c1d01ef commit e3828ee

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

demos/moveit_pick_place/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN git clone --depth 1 --branch ${ROS2_MEDKIT_REF} https://github.com/selfpatch
4646
ros2_medkit/src/ros2_medkit_serialization \
4747
ros2_medkit/src/ros2_medkit_fault_manager \
4848
ros2_medkit/src/ros2_medkit_fault_reporter \
49-
ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
50-
cp -r ros2_medkit/cmake ${COLCON_WS}/ && \
49+
ros2_medkit/src/ros2_medkit_diagnostic_bridge \
50+
ros2_medkit/src/ros2_medkit_cmake . && \
5151
rm -rf ros2_medkit
5252

5353
# Copy demo package from local context

demos/sensor_diagnostics/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN git clone --depth 1 https://github.com/selfpatch/ros2_medkit.git && \
3232
mv ros2_medkit/src/ros2_medkit_fault_manager . && \
3333
mv ros2_medkit/src/ros2_medkit_fault_reporter . && \
3434
mv ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
35-
cp -r ros2_medkit/cmake ${COLCON_WS}/ && \
35+
mv ros2_medkit/src/ros2_medkit_cmake . && \
3636
rm -rf ros2_medkit
3737

3838
# Copy demo package

demos/turtlebot3_integration/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN git clone --depth 1 https://github.com/selfpatch/ros2_medkit.git && \
5252
mv ros2_medkit/src/ros2_medkit_fault_manager . && \
5353
mv ros2_medkit/src/ros2_medkit_fault_reporter . && \
5454
mv ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
55-
cp -r ros2_medkit/cmake ${COLCON_WS}/ && \
55+
mv ros2_medkit/src/ros2_medkit_cmake . && \
5656
rm -rf ros2_medkit
5757

5858
# Copy demo package from local context (this repo)

0 commit comments

Comments
 (0)