Skip to content

Commit a54b54f

Browse files
RHEL: Use release packages instead of development version (#338)
1 parent 4ab3a9b commit a54b54f

File tree

8 files changed

+47
-39
lines changed

8 files changed

+47
-39
lines changed

ros2_rhel/Dockerfile.rhel8

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ RUN colcon mixin add default \
3737
ENV ROS2_WS=/opt/ros2_ws
3838
RUN mkdir -p $ROS2_WS/src
3939
WORKDIR $ROS2_WS
40-
COPY ros-controls.rhel8.repos .
41-
RUN vcs import src < ros-controls.rhel8.repos && \
40+
COPY ros-controls.$ROS_DISTRO.repos .
41+
RUN vcs import src < ros-controls.$ROS_DISTRO.repos && \
4242
. /opt/ros/$ROS_DISTRO/setup.bash && \
4343
rosdep update --rosdistro $ROS_DISTRO && \
4444
rosdep install -iyr --from-path src && \
4545
colcon build \
4646
--mixin release build-testing-off \
47-
--cmake-args --no-warn-unused-cli \
48-
--packages-up-to generate_parameter_library pal_statistics && \
47+
--cmake-args --no-warn-unused-cli && \
4948
rm -rf log src build
5049

5150
# add default.yaml to the image

ros2_rhel/Dockerfile.rhel9

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,15 @@ RUN colcon mixin add default \
6565
ENV ROS2_WS=/opt/ros2_ws
6666
RUN mkdir -p $ROS2_WS/src
6767
WORKDIR $ROS2_WS
68-
COPY ros-controls.rhel9.repos .
69-
RUN vcs import src < ros-controls.rhel9.repos && \
68+
COPY ros-controls.$ROS_DISTRO.repos .
69+
RUN vcs import src < ros-controls.$ROS_DISTRO.repos && \
7070
. /opt/ros/$ROS_DISTRO/setup.sh && \
7171
rosdep init && \
7272
rosdep update --rosdistro $ROS_DISTRO && \
73-
rosdep install -iyr --from-path src || true && \
73+
rosdep install -iyr --from-path src && \
7474
colcon build \
7575
--mixin release build-testing-off \
76-
--cmake-args --no-warn-unused-cli \
77-
--packages-up-to generate_parameter_library pal_statistics && \
76+
--cmake-args --no-warn-unused-cli && \
7877
rm -rf log src build
7978

8079
# add default.yaml to the image
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
repositories:
2+
rsl:
3+
type: git
4+
# url: https://github.com/ros2-gbp/RSL-release.git
5+
# version: rpm/humble/8/rsl
6+
# unless https://github.com/PickNikRobotics/RSL/pull/126 is released
7+
url: https://github.com/PickNikRobotics/RSL.git
8+
version: main
9+
generate_parameter_library/generate_parameter_library_py:
10+
type: git
11+
url: https://github.com/ros2-gbp/generate_parameter_library-release.git
12+
version: rpm/humble/8/generate_parameter_library_py
13+
generate_parameter_library/generate_parameter_library:
14+
type: git
15+
url: https://github.com/ros2-gbp/generate_parameter_library-release.git
16+
version: rpm/humble/8/generate_parameter_library
17+
generate_parameter_library/parameter_traits:
18+
type: git
19+
url: https://github.com/ros2-gbp/generate_parameter_library-release.git
20+
version: rpm/humble/8/parameter_traits

ros2_rhel/ros-controls.jazzy.repos

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
repositories:
2+
rsl:
3+
type: git
4+
url: https://github.com/ros2-gbp/RSL-release.git
5+
# https://github.com/PickNikRobotics/RSL/pull/126/files is not needed on RHEL9 -> we can use the release version
6+
version: rpm/jazzy/9/rsl
7+
generate_parameter_library/generate_parameter_library_py:
8+
type: git
9+
url: https://github.com/ros2-gbp/generate_parameter_library-release.git
10+
version: rpm/jazzy/9/generate_parameter_library_py
11+
generate_parameter_library/generate_parameter_library:
12+
type: git
13+
url: https://github.com/ros2-gbp/generate_parameter_library-release.git
14+
version: rpm/jazzy/9/generate_parameter_library
15+
generate_parameter_library/parameter_traits:
16+
type: git
17+
url: https://github.com/ros2-gbp/generate_parameter_library-release.git
18+
version: rpm/jazzy/9/parameter_traits
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repositories:

ros2_rhel/ros-controls.rhel8.repos

Lines changed: 0 additions & 17 deletions
This file was deleted.

ros2_rhel/ros-controls.rhel9.repos

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repositories:

0 commit comments

Comments
 (0)