Merge branch 'master' of https://github.com/OpenDroneMap/WebODM into crop

docker-compose.ipv6.yml

@@ -0,0 +1,9 @@
+version: '2.2'
+networks:
+  default:
+    enable_ipv6: true
+    ipam:
+      driver: default
+      config:
+        - subnet: "172.21.0.0/16"
+        - subnet: "fdec:cc68:5178::/64"

nginx/nginx-ssl.conf.template

@@ -36,6 +36,7 @@ http {
 
   server {
     listen 8000 deferred;
+    listen [::]:8000 deferred;
     client_max_body_size 0;
 
     server_name $WO_HOST;

nginx/nginx.conf.template

@@ -29,6 +29,7 @@ http {
 
   server {
     listen 8000 deferred;
+    listen [::]:8000 deferred;
     client_max_body_size 0;
 
     server_name $WO_HOST;

webodm.sh

@@ -148,6 +148,10 @@ case $key in
     shift # past argument
     shift # past value
     ;;
+    --ipv6)
+    ipv6=true
+    shift # past argument
+    ;;
     *)    # unknown option
     POSITIONAL+=("$1") # save it in an array for later
     shift # past argument
@@ -192,6 +196,7 @@ usage(){
   echo "	--settings	Path to a settings.py file to enable modifications of system settings (default: None)"
   echo "	--worker-memory	Maximum amount of memory allocated for the worker process (default: unlimited)"
   echo "	--worker-cpus	Maximum number of CPUs allocated for the worker process (default: all)"
+  echo "	--ipv6	Enable IPV6"
   
   exit
 }
@@ -457,6 +462,10 @@ start(){
 		command+=" -f docker-compose.worker-cpu.yml"
 	fi
 
+ 	if [[ $ipv6 = true ]]; then
+        command+=" -f docker-compose.ipv6.yml"
+    	fi
+
 	command="$command up"
 
 	if [[ $detached = true ]]; then
@@ -481,6 +490,10 @@ down(){
 		command+=" -f docker-compose.nodeodm.yml"
 	fi
 
+ 	if [[ $ipv6 = true ]]; then
+        	command+=" -f docker-compose.ipv6.yml"
+    	fi
+
 	command+=" -f docker-compose.nodemicmac.yml down --remove-orphans"
 
 	run "${command}"
@@ -584,6 +597,10 @@ elif [[ $1 = "stop" ]]; then
 		command+=" -f docker-compose.nodeodm.yml"
 	fi
 
+ 	if [[ $ipv6 = true ]]; then
+        	command+=" -f docker-compose.ipv6.yml"
+    	fi
+
 	command+=" -f docker-compose.nodemicmac.yml stop"
 	run "${command}"
 elif [[ $1 = "restart" ]]; then