update submodules

docker-build

@@ -3,11 +3,26 @@
 # update .NET
 
 REBUILD=false
-if [ "$1" == "--rebuild" ]; then
+
-	REBUILD=true
+vars=$(getopt -o r -l rebuild -- "$@")
-	shift
+if [ $? -ne 0 ]; then
+
+	echo "usage: docker-build [--rebuild]"
+	exit
+
 fi
 
+eval set -- $vars
+
+for opt; do
+	case "$opt" in 
+		-r|--rebuild)
+			REBUILD=true
+			shift
+		;;
+	esac
+done
+
 if [ "$REBUILD" == "true" ]; then
 	pushd ../mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server
 	dotnet build

docker-run

@@ -2,7 +2,39 @@
 
 USE_SSL=false
 
-./docker-build ${1+"$@"}
+vars=$(getopt -o p:sr --long port:,enable-ssh,rebuild -- "$@")
+if [ $? -ne 0 ]; then
+
+	echo "usage: docker-run [-r, --rebuild] [-p, --port PORTFORWARD] [-s, --enable-ssh]"
+	exit
+fi
+
+eval set -- "$vars"
+
+PORT_FORWARD=""
+ENABLE_SSH=""
+BUILD_OPTS=""
+
+for opt; do
+
+	case "$opt" in
+		-p|--port)
+			PORT_FORWARD=$2
+			shift 2
+			;;
+		-s|--enable-ssh)
+			ENABLE_SSH="true"
+			shift
+			;;
+		-r|--rebuild)
+			BUILD_OPTS+=" --rebuild"
+			shift
+			;;
+	esac
+
+done
+
+./docker-build $BUILD_OPTS
 
 Q=$?
 if [ $Q -ne 0 ]; then
@@ -11,22 +43,6 @@ if [ $Q -ne 0 ]; then
 
 fi
 
-PORT_FORWARD=""
-if [ "$1" == "--port" ]; then
-
-	PORT_FORWARD="$2"
-	shift; shift
-
-fi
-
-ENABLE_SSH=""
-if [ "$1" == "--enable-ssh" ]; then
-
-	ENABLE_SSH="true"
-	shift
-
-fi
-
 # generate random UUID for new SUV
 # thanks https://stackoverflow.com/questions/34328759
 # SUV_ID=$(hexdump -vn8 -e'2/4 "%08x" 1 "\n"' /dev/urandom)

mocha-common

@@ -1 +1 @@
-Subproject commit 3de871b3bf5c5e8ada6f293a4e1613fe08264ff1
+Subproject commit 534face1a0241487332b18b9fa93fa171b292a26

mocha-php

@@ -1 +1 @@
-Subproject commit 5e70c59ed63fbb91279746cc9bcb25d87b6a4956
+Subproject commit bd0293098297662d2378f44e862de49496150dd8

mocha-suv/docker/Dockerfile

@@ -3,7 +3,7 @@ RUN apt update && apt upgrade -y && apt install -y php php-mbstring php-curl php
 
 RUN rm /var/www/html/index.html && a2enmod ssl && a2enmod rewrite && service apache2 restart
 
-RUN mkdir /usr/lib/mocha && mkdir /etc/mocha && mkdir /var/mocha
+RUN mkdir /usr/lib/mocha && mkdir /etc/mocha && mkdir /var/mocha && bash -c 'echo docker > /etc/mocha/suvtype'
 
 # install the root file system overlay	
 COPY mocha-suv/docker/fs /