Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pal_statistics to image #9

Merged
merged 3 commits into from
Dec 7, 2024
Merged

Add pal_statistics to image #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6615d55
Add pal_statistics to image
christophfroehlich Dec 7, 2024
2325357
Explicitely build pal_statistics
christophfroehlich Dec 7, 2024
c602896
Update ENV
christophfroehlich Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ RUN colcon mixin add default \
https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
colcon metadata update

# we have to compile generate_parameter_library from source
ENV ROS2_WS /opt/ros2_ws
# build generate_parameter_library and other deps from source
ENV ROS2_WS=/opt/ros2_ws
RUN mkdir -p $ROS2_WS/src
WORKDIR $ROS2_WS
ADD ros-controls.rhel8.repos .
Expand All @@ -43,7 +43,7 @@ RUN vcs import src < ros-controls.rhel8.repos && \
colcon build \
--mixin release build-testing-off \
--cmake-args --no-warn-unused-cli \
--packages-up-to generate_parameter_library && \
--packages-up-to generate_parameter_library pal_statistics && \
rm -rf log src build

# add default.yaml to the image
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ RUN colcon mixin add default \
https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
colcon metadata update

# build generate_parameter_library from source
ENV ROS2_WS /opt/ros2_ws
# build generate_parameter_library and other deps from source
ENV ROS2_WS=/opt/ros2_ws
RUN mkdir -p $ROS2_WS/src
WORKDIR $ROS2_WS
ADD ros-controls.rhel9.repos .
Expand All @@ -72,7 +72,7 @@ RUN vcs import src < ros-controls.rhel9.repos && \
colcon build \
--mixin release build-testing-off \
--cmake-args --no-warn-unused-cli \
--packages-up-to generate_parameter_library && \
--packages-up-to generate_parameter_library pal_statistics && \
rm -rf log src build

# add default.yaml to the image
Expand Down
6 changes: 5 additions & 1 deletion ros-controls.rhel8.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ repositories:
cpp_polyfills:
type: git
url: https://github.com/PickNikRobotics/cpp_polyfills.git
version: main
version: main
pal_statistics:
type: git
url: https://github.com/pal-robotics/pal_statistics.git
version: humble-devel
6 changes: 5 additions & 1 deletion ros-controls.rhel9.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ repositories:
generate_parameter_library:
type: git
url: https://github.com/PickNikRobotics/generate_parameter_library.git
version: main
version: main
pal_statistics:
type: git
url: https://github.com/pal-robotics/pal_statistics.git
version: humble-devel
Loading