From 3e9e03d631b3c6ccb499598600f4e8d72c7494d9 Mon Sep 17 00:00:00 2001 From: action-bot Date: Wed, 1 May 2024 15:25:14 +0000 Subject: [PATCH 1/2] Update docker image tag --- demo/compose.minimal-setup.yaml | 12 ++++-------- demo/compose.simulation.yaml | 15 +++++---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/demo/compose.minimal-setup.yaml b/demo/compose.minimal-setup.yaml index c8d2daa..aaf00d7 100644 --- a/demo/compose.minimal-setup.yaml +++ b/demo/compose.minimal-setup.yaml @@ -1,15 +1,13 @@ -x-common-config: - &common-config +x-common-config: &common-config network_mode: host ipc: host restart: always environment: - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp # Default FastDDS do not work - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0} - services: panther_ros: - image: husarion/panther:humble-2.0.0-20240402 + image: husarion/panther:humble-2.0.1-20240430 container_name: panther_ros <<: *common-config devices: @@ -41,7 +39,5 @@ services: - /dev/input/js0 stop_signal: SIGINT command: > - bash -c - "ros2 launch joy2twist gamepad_controller.launch.py - joy2twist_params_file:=$(ros2 pkg prefix joy2twist)/share/joy2twist/config/joy2twist_panther.yaml - namespace:=panther" + bash -c "ros2 launch joy2twist gamepad_controller.launch.py joy2twist_params_file:=$(ros2 pkg prefix joy2twist)/share/joy2twist/config/joy2twist_panther.yaml namespace:=panther" + diff --git a/demo/compose.simulation.yaml b/demo/compose.simulation.yaml index 48b7436..8c87501 100644 --- a/demo/compose.simulation.yaml +++ b/demo/compose.simulation.yaml @@ -1,23 +1,17 @@ -x-common-config: - &common-config +x-common-config: &common-config network_mode: host ipc: host environment: - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp # Default FastDDS do not work - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0} - -x-cpu-config: - &cpu-config +x-cpu-config: &cpu-config env_file: .env.cpu - -x-gpu-config: - &gpu-config +x-gpu-config: &gpu-config runtime: nvidia env_file: .env.gpu - services: panther_gazebo: - image: husarion/panther-gazebo:humble-2.0.0-20240402 + image: husarion/panther-gazebo:humble-2.0.1-20240430 container_name: panther_gazebo <<: - *common-config @@ -26,3 +20,4 @@ services: - /tmp/.X11-unix:/tmp/.X11-unix:rw command: > ros2 launch panther_gazebo simulation.launch.py + From e63696d8cb7758ae4ac80817a6ac8353f790992d Mon Sep 17 00:00:00 2001 From: action-bot Date: Wed, 1 May 2024 16:22:56 +0000 Subject: [PATCH 2/2] Update docker image version --- demo/compose.minimal-setup.yaml | 2 +- demo/compose.simulation.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/compose.minimal-setup.yaml b/demo/compose.minimal-setup.yaml index aaf00d7..821b68f 100644 --- a/demo/compose.minimal-setup.yaml +++ b/demo/compose.minimal-setup.yaml @@ -7,7 +7,7 @@ x-common-config: &common-config - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0} services: panther_ros: - image: husarion/panther:humble-2.0.1-20240430 + image: husarion/panther:humble-2.0.1-20240430-stable container_name: panther_ros <<: *common-config devices: diff --git a/demo/compose.simulation.yaml b/demo/compose.simulation.yaml index 8c87501..9d01439 100644 --- a/demo/compose.simulation.yaml +++ b/demo/compose.simulation.yaml @@ -11,7 +11,7 @@ x-gpu-config: &gpu-config env_file: .env.gpu services: panther_gazebo: - image: husarion/panther-gazebo:humble-2.0.1-20240430 + image: husarion/panther-gazebo:humble-2.0.1-20240430-stable container_name: panther_gazebo <<: - *common-config