feat: set container names for node-odm services

OpenDroneMap · Sep 4, 2024 · 94ad7bf · 94ad7bf
1 parent 1a363fb
commit 94ad7bf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/docker-compose.nodeodm.gpu.intel.yml b/docker-compose.nodeodm.gpu.intel.yml
@@ -13,6 +13,7 @@ services:
     environment:
       - RENDER_GROUP_ID
     image: opendronemap/nodeodm:gpu.intel
+    container_name: node-odm-1
     devices:
       - "/dev/dri"
     expose:

diff --git a/docker-compose.nodeodm.gpu.nvidia.yml b/docker-compose.nodeodm.gpu.nvidia.yml
@@ -11,6 +11,7 @@ services:
       - WO_DEFAULT_NODES
   node-odm:
     image: opendronemap/nodeodm:gpu
+    container_name: node-odm-1
     expose:
       - "3000"
     restart: unless-stopped

diff --git a/docker-compose.nodeodm.yml b/docker-compose.nodeodm.yml
@@ -11,6 +11,7 @@ services:
       - WO_DEFAULT_NODES
   node-odm:
     image: opendronemap/nodeodm
+    container_name: node-odm-1
     expose:
       - "3000"
     restart: unless-stopped

diff --git a/webodm.sh b/webodm.sh
@@ -473,13 +473,9 @@ start(){
 down(){
 	command="$docker_compose -f docker-compose.yml"
 
-	if [ "${GPU_NVIDIA}" = true ]; then
-		command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
-	elif [ "${GPU_INTEL}" = true ]; then
-		command+=" -f docker-compose.nodeodm.gpu.intel.yml"
-	else
-		command+=" -f docker-compose.nodeodm.yml"
-	fi
+	command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
+	command+=" -f docker-compose.nodeodm.gpu.intel.yml"
+	command+=" -f docker-compose.nodeodm.yml"
 
 	command+=" -f docker-compose.nodemicmac.yml down --remove-orphans"
 
@@ -576,13 +572,11 @@ elif [[ $1 = "stop" ]]; then
 
 	command="$docker_compose -f docker-compose.yml"
 
-	if [ "${GPU_NVIDIA}" = true ]; then
-		command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
-	elif [ "${GPU_INTEL}" = true ]; then
-		command+=" -f docker-compose.nodeodm.gpu.intel.yml"
-	else
-		command+=" -f docker-compose.nodeodm.yml"
-	fi
+
+	command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
+	command+=" -f docker-compose.nodeodm.gpu.intel.yml"
+	command+=" -f docker-compose.nodeodm.yml"
+
 
 	command+=" -f docker-compose.nodemicmac.yml stop"
 	run "${command}"