Skip to content

Commit 6c925de

Browse files
committed
Move rosdep skip-keys to separate file (#228)
1 parent a1f1040 commit 6c925de

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

moveit2/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ RUN rosinstall_generator \
109109
--rosdistro ${ROS_DISTRO} \
110110
--deps \
111111
--exclude-path ${SPACEROS_DIR}/src \
112-
--exclude $(cat /tmp/excluded-pkgs.txt) -- \
112+
--exclude $(cat /tmp/excluded-pkgs.txt) \
113113
-- $(cat /tmp/moveit2-pkgs.txt) \
114114
> /tmp/moveit2_generated_pkgs.repos
115115

@@ -122,10 +122,11 @@ RUN vcs import src < /tmp/moveit2_generated_pkgs.repos
122122
RUN sudo chown -R ${USERNAME}:${USERNAME} ${MOVEIT2_DIR}
123123

124124
# Install system dependencies
125+
COPY --chown=${USERNAME}:${USERNAME} rosdep-skip.txt /tmp/
125126
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
126127
--mount=type=cache,target=/var/lib/apt,sharing=locked \
127128
/bin/bash -c 'source ${SPACEROS_DIR}/install/setup.bash' \
128-
&& rosdep install --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -r -y --skip-keys "composition console_bridge demo_nodes_py diagnostic_aggregator diagnostic_updater fastcdr fastrtps generate_parameter_library google_benchmark_vendor ikos joy lifecycle qt_gui rmw_connextdds rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp ros_testing rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp rqt_gui rqt_gui_py rti-connext-dds-5.3.1 urdfdom urdfdom_headers"
129+
&& rosdep install --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -r -y --skip-keys "$(cat /tmp/rosdep-skip.txt | tr '\n' ' ')"
129130

130131
# Build MoveIt2
131132
RUN /bin/bash -c 'source ${SPACEROS_DIR}/install/setup.bash \

moveit2/rosdep-skip.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
composition
2+
console_bridge
3+
demo_nodes_py
4+
diagnostic_aggregator
5+
diagnostic_updater
6+
fastcdr
7+
fastrtps
8+
generate_parameter_library
9+
google_benchmark_vendor
10+
ikos
11+
joy
12+
lifecycle
13+
qt_gui
14+
rmw_connextdds
15+
rmw_connextdds
16+
rmw_fastrtps_cpp
17+
rmw_fastrtps_dynamic_cpp
18+
ros_testing
19+
rosidl_typesupport_fastrtps_c
20+
rosidl_typesupport_fastrtps_cpp
21+
rqt_gui
22+
rqt_gui_py
23+
rti-connext-dds-5.3.1
24+
urdfdom
25+
urdfdom_headers

0 commit comments

Comments
 (0)