Skip to content

Commit 8611a7a

Browse files
committed
chore: include ros2_bridge in colcon and runtime image builds
Extend local README, scripts/build.sh, and docker/runtime so rosdep and colcon build the ros2_bridge package together with drs_launch and proto_recorder. Runtime Dockerfile now scopes rosdep to the same package set and passes --rosdistro. Remove a stale commented COPY line from the calibration Dockerfile. Fix duplicate ros2_bridge entry in the runtime colcon build line. How to verify: - Run ./scripts/build.sh from a sourced ROS 2 workspace and confirm ros2_bridge builds. - docker build -f docker/runtime/Dockerfile . (or project CI) completes the colcon step without duplicate-package errors. Improvements: - Aligns documented and containerized builds with the ros2_bridge package. - Narrower rosdep install in runtime Dockerfile versus from-paths src. Limitations: - ros2_bridge remains under src/drs-api; clones without drs-api will still not build that package. Made-with: Cursor
1 parent 24c7e56 commit 8611a7a

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ This project depends on the private repository [tier4/c2_readout_delay_setter](h
3535
git clone https://github.com/tier4/data_recording_system.git
3636
cd data_recording_system
3737
./scripts/setup_repos.sh --token <GITHUB_TOKEN>
38-
rosdep install -y -r --from-paths `colcon list --packages-up-to drs_launch -p` --ignore-src
39-
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-up-to drs_launch
38+
rosdep install -y -r --from-paths `colcon list --packages-up-to drs_launch proto_recorder ros2_bridge -p` --ignore-src
39+
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release --packages-up-to drs_launch proto_recorder ros2_bridge
4040
```

docker/calibration/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ RUN apt-get update && \
4040
ARG COLCON_PARALLEL_WORKERS=2
4141

4242
WORKDIR /opt/drs
43-
# COPY src/ /opt/drs/src/
4443

4544
RUN mkdir -p /opt/drs/src && \
4645
git clone https://github.com/tier4/CalibrationTools.git -b feat/drs_202505 /opt/drs/src/calibration_tools && \

docker/runtime/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
6060
--mount=type=cache,target=/var/lib/apt,sharing=locked \
6161
apt-get update && \
6262
source /opt/ros/${ROS_DISTRO}/setup.bash && \
63-
rosdep install -y -r --from-paths src --ignore-src
63+
rosdep install -y -r --from-paths `colcon list --packages-up-to drs_launch proto_recorder ros2_bridge -p` --ignore-src --rosdistro ${ROS_DISTRO}
6464

6565
# Create install directory
6666
RUN mkdir -p /opt/drs/install
6767

6868
# Build DRS packages
6969
RUN source /opt/ros/${ROS_DISTRO}/setup.bash && \
70-
colcon build --merge-install --install-base /opt/drs/install --parallel-workers ${COLCON_PARALLEL_WORKERS} --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF --packages-up-to drs_launch proto_recorder && \
70+
colcon build --merge-install --install-base /opt/drs/install --parallel-workers ${COLCON_PARALLEL_WORKERS} --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF --packages-up-to drs_launch proto_recorder ros2_bridge && \
7171
# Remove unnecessary development files before copying to runtime
7272
find /opt/drs/install -name "*.a" -delete && \
7373
find /opt/drs/install -name "*.cmake" -delete && \

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ if ! command -v colcon &>/dev/null; then
1010
exit 1
1111
fi
1212

13-
colcon build --merge-install --install-base /opt/drs/install --parallel-workers 4 --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF --packages-up-to drs_launch proto_recorder
13+
colcon build --merge-install --install-base /opt/drs/install --parallel-workers 4 --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF --packages-up-to drs_launch proto_recorder ros2_bridge

0 commit comments

Comments
 (0)