Add envs to compose

husarion · Dec 19, 2024 · 5a64613 · 5a64613
1 parent a9944b1
commit 5a64613
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/docker/demo/compose.hardware.yaml b/docker/demo/compose.hardware.yaml
@@ -34,7 +34,8 @@ services:
         soft: 102400
         hard: 102400
     command: >
-      ros2 launch husarion_ugv_bringup bringup.launch.py common_dir_path:=/config
+      ros2 launch husarion_ugv_bringup bringup.launch.py
+        common_dir_path:=/config
 
   gamepad_controller:
     image: husarion/joy2twist:humble-1.0.0-20241003-stable
@@ -48,4 +49,5 @@ services:
       - 'c 13:0 rmw' # gamepad
     stop_signal: SIGINT
     command: >
-      ros2 launch joy2twist gamepad_controller.launch.py joy2twist_params_file:=/joy2twist.yaml
+      ros2 launch joy2twist gamepad_controller.launch.py
+        joy2twist_params_file:=/joy2twist.yaml
diff --git a/docker/demo/compose.rviz.yaml b/docker/demo/compose.rviz.yaml
@@ -4,6 +4,7 @@ x-common-config:
   ipc: host
   environment:
     - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp # Default FastDDS do not work
+    - ROBOT_NAMESPACE=${ROBOT_NAMESPACE:-panther}
     - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0}
 
 x-cpu-config:

diff --git a/docker/demo/compose.simulation.yaml b/docker/demo/compose.simulation.yaml
@@ -3,6 +3,8 @@ x-common-config: &common-config
   ipc: host
   environment:
     - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
+    - ROBOT_MODEL=${ROBOT_MODEL:-panther}
+    - ROBOT_NAMESPACE=${ROBOT_NAMESPACE:-panther}
     - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0}
 
 x-cpu-config: &cpu-config
@@ -23,5 +25,3 @@ services:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
     command: >
       ros2 launch panther_gazebo simulation.launch.py
-        namespace:=panther
-        robot_model:=panther