Explorar o código

RobotVacuum Updates to Dockerfile and docker scripts (#17)

Add 'fullscreen' argument to launcher command, to be controlled by the environment variable `LAUNCH_FULLSCREEN_OPT`

Signed-off-by: Steve Pham <[email protected]>
Steve Pham %!s(int64=2) %!d(string=hai) anos
pai
achega
c15b7ecfa8
Modificáronse 3 ficheiros con 11 adicións e 12 borrados
  1. 10 10
      Docker/Dockerfile
  2. 0 1
      Docker/LaunchNavStack.bash
  3. 1 1
      Docker/LaunchSimulation.bash

+ 10 - 10
Docker/Dockerfile

@@ -83,15 +83,15 @@ RUN apt-get install -y --no-install-recommends git \
                        libxcb-randr0 \
                        libnvidia-gl-470 \
                        ufw \
-                       ros-${ROS_VERSION}-slam-toolbox \
-                       ros-${ROS_VERSION}-navigation2 \
-                       ros-${ROS_VERSION}-nav2-bringup \
-                       ros-${ROS_VERSION}-pointcloud-to-laserscan \
-                       ros-${ROS_VERSION}-gazebo-msgs \
-                       ros-${ROS_VERSION}-ackermann-msgs \
-                       ros-${ROS_VERSION}-rmw-cyclonedds-cpp \
-                       ros-${ROS_VERSION}-control-toolbox \
-                       ros-${ROS_VERSION}-nav-msgs 
+                       ros-${ROS_DISTRO}-slam-toolbox \
+                       ros-${ROS_DISTRO}-navigation2 \
+                       ros-${ROS_DISTRO}-nav2-bringup \
+                       ros-${ROS_DISTRO}-pointcloud-to-laserscan \
+                       ros-${ROS_DISTRO}-gazebo-msgs \
+                       ros-${ROS_DISTRO}-ackermann-msgs \
+                       ros-${ROS_DISTRO}-rmw-cyclonedds-cpp \
+                       ros-${ROS_DISTRO}-control-toolbox \
+                       ros-${ROS_DISTRO}-nav-msgs 
 
 COPY cleanup.bash /data/workspace/cleanup.bash
 
@@ -135,7 +135,7 @@ COPY LaunchSimulation.bash /data/workspace/LaunchSimulation.bash
 COPY LaunchNavStack.bash /data/workspace/LaunchNavStack.bash
 
 ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp 
-
+ENV LAUNCH_FULLSCREEN_OPT=0
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES all
  

+ 0 - 1
Docker/LaunchNavStack.bash

@@ -13,4 +13,3 @@ source /opt/ros/$ROS_DISTRO/setup.bash
 cd /data/workspace/RobotVacuumSample/launch
 
 ros2 launch navigation.launch.py
-

+ 1 - 1
Docker/LaunchSimulation.bash

@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH=/data/workspace/RobotVacuumSample/build/linux/bin/profile
 if [ -d /data/workspace/RobotVacuumSample/build/linux/bin/profile ]
 then
     cd /data/workspace/RobotVacuumSample/build/linux/bin/profile
-    ./RobotVacuumSample.GameLauncher -bg_ConnectToAssetProcessor=0 > /data/workspace/simulation_launch.log 2>&1
+    ./RobotVacuumSample.GameLauncher -r_fullscreen=$LAUNCH_FULLSCREEN_OPT -bg_ConnectToAssetProcessor=0 > /data/workspace/simulation_launch.log 2>&1
 else
     echo "Simulation not installed on this image"
 fi