From d9a1b21e54a584ba24c1ec869861660611af1178 Mon Sep 17 00:00:00 2001
From: franklinselva <franklinselva10@gmail.com>
Date: Wed, 11 Sep 2024 17:35:11 +0200
Subject: [PATCH] Minor fixes for docker compose file

Related to space-ros/space-ros#178
---
 canadarm2/build.sh                 | 2 +-
 canadarm2/docker-compose.yml       | 9 +--------
 canadarm2/run.sh                   | 4 ++--
 curiosity_rover/build.sh           | 2 +-
 curiosity_rover/docker-compose.yml | 9 +--------
 curiosity_rover/run.sh             | 4 ++--
 6 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/canadarm2/build.sh b/canadarm2/build.sh
index 4acd9abe..2dac2550 100755
--- a/canadarm2/build.sh
+++ b/canadarm2/build.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-docker-compose build
+docker compose build
diff --git a/canadarm2/docker-compose.yml b/canadarm2/docker-compose.yml
index 58086413..9d1123a7 100644
--- a/canadarm2/docker-compose.yml
+++ b/canadarm2/docker-compose.yml
@@ -25,17 +25,10 @@ services:
       [
         "bash",
         "-c",
-        "source /opt/ros/$ROS_DISTRO/setup.bash && source ~/canadarm2_ws/install/setup.bash && ros2 launch canadarm_gazebo canadarm.launch.py",
+        "source /opt/ros/humble/setup.bash && source ~/canadarm2_ws/install/setup.bash && ros2 launch canadarm_gazebo canadarm.launch.py",
       ]
     network_mode: host
     privileged: true # for UI
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: 1
-              capabilities: [gpu]
   canadarm_demo:
     image: osrf/space-ros:canadarm_demo
     build:
diff --git a/canadarm2/run.sh b/canadarm2/run.sh
index 2e27a557..ae535312 100755
--- a/canadarm2/run.sh
+++ b/canadarm2/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-comppose down
-docker-compose up -d
+docker compose down
+docker compose up -d
diff --git a/curiosity_rover/build.sh b/curiosity_rover/build.sh
index 4acd9abe..2dac2550 100755
--- a/curiosity_rover/build.sh
+++ b/curiosity_rover/build.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-docker-compose build
+docker compose build
diff --git a/curiosity_rover/docker-compose.yml b/curiosity_rover/docker-compose.yml
index bbd01c33..b67b2389 100644
--- a/curiosity_rover/docker-compose.yml
+++ b/curiosity_rover/docker-compose.yml
@@ -25,17 +25,10 @@ services:
       [
         "bash",
         "-c",
-        "source /opt/ros/$ROS_DISTRO/setup.bash && source ~/curiosity_ws/install/setup.bash && ros2 launch curiosity_gazebo curiosity_gazebo.launch.py",
+        "source /opt/ros/humble/setup.bash && source ~/curiosity_ws/install/setup.bash && ros2 launch curiosity_gazebo curiosity_gazebo.launch.py",
       ]
     network_mode: host
     privileged: true # for UI
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: 1
-              capabilities: [gpu]
   curiosity_demo:
     image: osrf/space-ros:curiosity_demo
     build:
diff --git a/curiosity_rover/run.sh b/curiosity_rover/run.sh
index e193f135..ae535312 100755
--- a/curiosity_rover/run.sh
+++ b/curiosity_rover/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-compose down
-docker-compose up -d
+docker compose down
+docker compose up -d