Update for Humble (space-ros#28)

Signed-off-by: Michael Jeronimo <[email protected]> Signed-off-by: Michael Jeronimo <[email protected]>
B-AROL-O · Sep 1, 2022 · c35fd68 · c35fd68
1 parent b4b1d90
commit c35fd68
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/demo_spaceros/Dockerfile b/demo_spaceros/Dockerfile
@@ -40,7 +40,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # Define a few key variables
 ARG SPACEROS_DEMO_DIR=${SRC_DIR}/spaceros_demo
-ARG ROSDISTRO=rolling
 ENV IGNITION_VERSION fortress
 
 # Get rosinstall_generator

diff --git a/demo_spaceros/excluded-pkgs.txt b/demo_spaceros/excluded-pkgs.txt
@@ -1,5 +1,6 @@
 fastrtps
 fastcdr
+generate_parameter_library
 rmw_fastrtps_cpp
 rmw_fastrtps_dynamic_cpp
 rmw_fastrtps_shared_cpp

diff --git a/moveit2/Dockerfile b/moveit2/Dockerfile
@@ -91,7 +91,7 @@ RUN sudo vcs import src < moveit2.repos
 RUN sudo chown -R ${USERNAME}:${USERNAME} ${MOVEIT2_DIR}
 
 # Install system dependencies
-RUN rosdep install --from-paths ../spaceros/src src --ignore-src --rosdistro rolling -y --skip-keys "console_bridge fastcdr fastrtps rti-connext-dds-5.3.1 urdfdom_headers rmw_connextdds ros_testing rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp composition demo_nodes_py lifecycle rosidl_typesupport_fastrtps_cpp rosidl_typesupport_fastrtps_c ikos diagnostic_aggregator diagnostic_updater joy qt_gui rqt_gui rqt_gui_py"
+RUN rosdep install --from-paths ../spaceros/src src --ignore-src --rosdistro ${ROSDISTRO} -y --skip-keys "console_bridge fastcdr fastrtps rti-connext-dds-5.3.1 urdfdom_headers rmw_connextdds ros_testing rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp composition demo_nodes_py lifecycle rosidl_typesupport_fastrtps_cpp rosidl_typesupport_fastrtps_c ikos diagnostic_aggregator diagnostic_updater joy qt_gui rqt_gui rqt_gui_py"
 
 # Apply a patch to octomap_msgs to work around a build issue
 COPY --chown=${USERNAME}:${USERNAME} octomap_fix.diff ./src/octomap_msgs

diff --git a/spaceros/Dockerfile b/spaceros/Dockerfile
@@ -38,12 +38,13 @@ LABEL org.label-schema.vcs-ref=${VCS_REF}
 # Disable prompting during package installation
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Define the username and key locations
+# Define the username and key variables
 ENV USERNAME spaceros-user
 ENV SRC_DIR=/home/${USERNAME}/src
 ENV SPACEROS_DIR=${SRC_DIR}/spaceros
 ARG IKOS_DIR=${SRC_DIR}/ikos
 ARG REPOS_FILE_URL="https://raw.githubusercontent.com/space-ros/space-ros/main/ros2.repos"
+ENV ROSDISTRO=humble
 
 # https://github.com/NVIDIA/cuda-repo-management/issues/1
 # Use new GPG keys for nvidia apt repositories that have not yet propagated to base images.
@@ -116,7 +117,7 @@ RUN vcs import src < ros2.repos
 # Install system dependencies
 RUN sudo rosdep init && \
   rosdep update && \
-  rosdep install --from-paths src --ignore-src --rosdistro rolling -y --skip-keys "console_bridge fastcdr fastrtps rti-connext-dds-5.3.1 urdfdom_headers rmw_connextdds ros_testing rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp composition demo_nodes_py lifecycle rosidl_typesupport_fastrtps_cpp rosidl_typesupport_fastrtps_c ikos"
+  rosdep install --from-paths src --ignore-src --rosdistro ${ROSDISTRO} -y --skip-keys "console_bridge fastcdr fastrtps rti-connext-dds-5.3.1 urdfdom_headers rmw_connextdds ros_testing rmw_connextdds rmw_fastrtps_cpp rmw_fastrtps_dynamic_cpp composition demo_nodes_py lifecycle rosidl_typesupport_fastrtps_cpp rosidl_typesupport_fastrtps_c ikos"
 
 # Build the Space ROS source code
 RUN colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON