Skip to content

Commit

Permalink
Fix ros1_bridge naming
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Friedman <[email protected]>
  • Loading branch information
Ryanf55 committed Nov 20, 2024
1 parent 4989e73 commit 2e5acbe
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ros/humble/ubuntu/focal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cd ros-core
docker build . -t ros:humble-ros-core-focal

# Install ROS 1 binaries and then build the rosbridge with colcon.
# Install ROS 1 binaries and then build the ros1_bridge with colcon.
cd ../ros1-bridge
docker build . -t ros:humble-ros1-bridge-focal
dit ros:humble-ros1-bridge-focal
Expand Down
2 changes: 1 addition & 1 deletion ros/humble/ubuntu/focal/ros-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Usage:
# docker build . -t ros:humble-ros-core-focal
#
# Documentation for rosbridge setup: https://github.com/ros2/ros1_bridge?tab=readme-ov-file#building-the-bridge-from-source
# Documentation for ros1_bridge setup: https://github.com/ros2/ros1_bridge?tab=readme-ov-file#building-the-bridge-from-source

# We use focal becaue ROS 1 can be installed with binaries,
# and ROS 2 humble supports compilation as a Tier 3 platform per REP-2000.
Expand Down
4 changes: 2 additions & 2 deletions ros/humble/ubuntu/focal/ros1-bridge/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ RUN apt-get update && \
# Build all custom messge packages here in the right order.
RUN . /opt/ros/humble/setup.sh && colcon build --packages-up-to ${CUSTOM_MSG_PKGS}

# Source the local workspace then build just the rosbridge.
# Source the local workspace then build just the ros1_bridge.
# This links to all the other message packages at build time.
# Order of sourcing is VERY picky and NOT clear in the rosbridge README.
# Order of sourcing is VERY picky and NOT clear in the ros1_bridge README.
# https://github.com/ros2/ros1_bridge?tab=readme-ov-file#building-the-bridge-from-source
# This shows the source order with custom workspaces
# https://github.com/jayprajapati009/ros1_bridge_tutorial?tab=readme-ov-file#ros1_bridge-setup
Expand Down

0 comments on commit 2e5acbe

Please sign in to comment.