MicMac integration tweaks

nodeodm/external/NodeODM

@@ -0,0 +1 @@
+Subproject commit 2779f7337ef19aa9efbf44576a04887dd5a18762

start.sh

@@ -45,8 +45,6 @@ if [ "$1" = "--setup-devenv" ] || [ "$2" = "--setup-devenv" ]; then
     npm install
     cd nodeodm/external/NodeODM
     npm install
-    cd nodeodm/external/NodeMICMAC
-    npm install
     cd /webodm
 
     echo Setup pip requirements...

webodm.sh

@@ -89,7 +89,7 @@ case $key in
     load_default_node=false
     shift # past argument
     ;;
-    --micmac-node)
+    --with-micmac)
     load_micmac_node=true
     shift # past argument
     ;;
@@ -121,7 +121,7 @@ usage(){
   echo "	--hostname	<hostname>	Set the hostname that WebODM will be accessible from (default: $DEFAULT_HOST)"
   echo "	--media-dir	<path>	Path where processing results will be stored to (default: $DEFAULT_MEDIA_DIR (docker named volume))"
   echo "	--no-default-node	Do not create a default NodeODM node attached to WebODM on startup (default: disabled)"
-  echo "	--micmac-node	Create a NodeMICMAC node attached to WebODM on startup. Experimental! (default: disabled)"
+  echo "	--with-micmac	Create a NodeMICMAC node attached to WebODM on startup. Experimental! (default: disabled)"
   echo "	--ssl	Enable SSL and automatically request and install a certificate from letsencrypt.org. (default: $DEFAULT_SSL)"
   echo "	--ssl-key	<path>	Manually specify a path to the private key file (.pem) to use with nginx to enable SSL (default: None)"
   echo "	--ssl-cert	<path>	Manually specify a path to the certificate file (.pem) to use with nginx to enable SSL (default: None)"
@@ -256,7 +256,6 @@ rebuild(){
 	run "docker-compose down --remove-orphans"
 	run "rm -fr node_modules/ || sudo rm -fr node_modules/"
 	run "rm -fr nodeodm/external/NodeODM || sudo rm -fr nodeodm/external/NodeODM"
-	run "rm -fr nodeodm/external/NodeMICMAC || sudo rm -fr nodeodm/external/NodeMICMAC"
 	run "docker-compose -f docker-compose.yml -f docker-compose.build.yml build --no-cache"
 	#run "docker images --no-trunc -aqf \"dangling=true\" | xargs docker rmi"
 	echo -e "\033[1mDone!\033[0m You can now start WebODM by running $0 start"
@@ -326,10 +325,19 @@ elif [[ $1 = "update" ]]; then
 	down
 	echo "Updating WebODM..."
 	run "git pull origin master"
-	run "docker pull opendronemap/nodeodm"
-	run "docker pull dronemapper/node-micmac"
-	run "docker pull opendronemap/webodm_db"
-	run "docker pull opendronemap/webodm_webapp"
+
+    command="docker-compose -f docker-compose.yml"
+
+    if [[ $load_default_node = true ]]; then
+        command+=" -f docker-compose.nodeodm.yml"
+    fi
+
+    if [[ $load_micmac_node = true ]]; then
+        command+=" -f docker-compose.nodemicmac.yml"
+    fi
+
+    command+=" pull"
+    run "$command"
 	echo -e "\033[1mDone!\033[0m You can now start WebODM by running $0 start"
 elif [[ $1 = "checkenv" ]]; then
 	environment_check