From d661b1df33693444ed9e6b85c864eddb5978b420 Mon Sep 17 00:00:00 2001
From: Burak Ozter <burak.ozter@spirirobotics.com>
Date: Fri, 1 Nov 2024 15:32:43 -0300
Subject: [PATCH] remove container names, use project name for docker-compose

---
 docker-compose.yml | 5 -----
 sim_drone.py       | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bd1c873..613aa63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,6 @@ services:
     #             - nvidia.com/gpu=all
 
   ardupilot:
-    container_name: ardupilot-$DRONE_SYS_ID
     env_file:
       - .env
     image: git.spirirobotics.com/spiri/ardupilot:spiri-master
@@ -62,7 +61,6 @@ services:
     network_mode: host
 
   mavproxy:
-    container_name: mavproxy-$DRONE_SYS_ID
     env_file:
       - .env
     image: git.spirirobotics.com/spiri/services-mavproxy:main
@@ -80,7 +78,6 @@ services:
     restart: always
 
   mavros2:
-    container_name: mavros2-$DRONE_SYS_ID
     env_file:
       - .env
     image: git.spirirobotics.com/spiri/services-ros2-mavros:main
@@ -107,7 +104,6 @@ services:
   mavros:
     #This service bridges our mavlink-based robot-coprosessor into ROS
     #In this example it connects to a simulated coprocessor.
-    container_name: mavros1-$DRONE_SYS_ID
     env_file:
       - .env
     image: git.spirirobotics.com/spiri/services-ros1-mavros:master
@@ -128,7 +124,6 @@ services:
         hard: 524288
 
   ros-master:
-    container_name: ros-master
     env_file:
       - .env
     image: git.spirirobotics.com/spiri/services-ros1-core:main
diff --git a/sim_drone.py b/sim_drone.py
index c9600fe..e6eb46c 100644
--- a/sim_drone.py
+++ b/sim_drone.py
@@ -108,6 +108,8 @@ def start(tracker_instance: int = 0, sys_id: int = 1):
             docker_stack = sh.docker.compose(
                 "--profile",
                 "uav-sim",
+                "-p",
+                f"spiri-sdk-{sys_id}",
                 "up",
                 _out=outputLogger("docker_stack", sys_id),
                 _err=sys.stderr,