From ae69f83eb890fd944a179c77ae2478cbe1ec5955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Sat, 7 Dec 2024 10:09:57 +0100
Subject: [PATCH] Add pal_statistics to image (#9)

---
 Dockerfile.rhel8         | 6 +++---
 Dockerfile.rhel9         | 6 +++---
 ros-controls.rhel8.repos | 6 +++++-
 ros-controls.rhel9.repos | 6 +++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.rhel8 b/Dockerfile.rhel8
index 47fc80b..784a686 100644
--- a/Dockerfile.rhel8
+++ b/Dockerfile.rhel8
@@ -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 .
@@ -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
diff --git a/Dockerfile.rhel9 b/Dockerfile.rhel9
index 02637b4..74e5de4 100644
--- a/Dockerfile.rhel9
+++ b/Dockerfile.rhel9
@@ -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 .
@@ -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
diff --git a/ros-controls.rhel8.repos b/ros-controls.rhel8.repos
index f509b06..40355bf 100644
--- a/ros-controls.rhel8.repos
+++ b/ros-controls.rhel8.repos
@@ -10,4 +10,8 @@ repositories:
   cpp_polyfills:
     type: git
     url: https://github.com/PickNikRobotics/cpp_polyfills.git
-    version:  main
\ No newline at end of file
+    version:  main
+  pal_statistics:
+    type: git
+    url: https://github.com/pal-robotics/pal_statistics.git
+    version: humble-devel
\ No newline at end of file
diff --git a/ros-controls.rhel9.repos b/ros-controls.rhel9.repos
index 46343e9..e017a89 100644
--- a/ros-controls.rhel9.repos
+++ b/ros-controls.rhel9.repos
@@ -6,4 +6,8 @@ repositories:
   generate_parameter_library:
     type: git
     url: https://github.com/PickNikRobotics/generate_parameter_library.git
-    version:  main
\ No newline at end of file
+    version:  main
+  pal_statistics:
+    type: git
+    url: https://github.com/pal-robotics/pal_statistics.git
+    version: humble-devel
\ No newline at end of file