Skip to content

Commit

Permalink
ROS2 Crystal container: Fast-RTPS 1.7: move back to upstream '1.7.x' …
Browse files Browse the repository at this point in the history
…branch as eProsima/Fast-DDS#828 was merged
  • Loading branch information
TSC21 committed Nov 7, 2019
1 parent d269970 commit 54a70a5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions docker/Dockerfile_ros2-crystal
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ RUN apt-get install -y --quiet python3-gencpp \


# Downgrade Fast-RTPS to 1.7.2 (and replace Fast-RTPS-Gen)
# Note: this uses a different branch from upstream that brings an hotfix for https://github.com/eProsima/Fast-RTPS/issues/820
RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/libfastrtps* /usr/local/bin/fastrtpsgen \
&& git clone --recursive https://github.com/TSC21/Fast-RTPS.git -b fix/1.7.x_fastrtpsgen_version_file_gen /tmp/FastRTPS-1.7.2 \
&& git clone --recursive https://github.com/eProsima/Fast-RTPS.git -b 1.7.x /tmp/FastRTPS-1.7.2 \
&& cd /tmp/FastRTPS-1.7.2 \
&& mkdir build && cd build \
&& cmake -DBUILD_JAVA=ON -DTHIRDPARTY=ON -DSECURITY=ON .. \
Expand Down

0 comments on commit 54a70a5

Please sign in to comment.