From 2e44f70931af7bd2948a3a9aed593e02512fb6bf Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Sat, 1 Mar 2025 22:49:44 -0500
Subject: [PATCH] add some new options to docker-run for use with CUPs

---
 docker-build | 14 ++++++++++++++
 docker-run   | 26 +++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/docker-build b/docker-build
index 327f107..4f034d3 100755
--- a/docker-build
+++ b/docker-build
@@ -26,13 +26,27 @@ done
 if [ "$REBUILD" == "true" ]; then
 	pushd ../mocha-dotnet/mocha-dotnet/src/app/Mocha.Oms.Server
 	dotnet build
+	Q=$?
 	popd
 
+	if [ $Q -ne 0 ]; then
+		echo "Build failed!"
+		exit $Q
+	fi
+
 	# build the libraries
 	pushd mocha-common/mocha-common
 	./build
+	Q=$?
 	popd
 
+	if [ $Q -ne 0 ]; then
+
+		echo "Build failed!"
+		exit $Q
+
+	fi
+
 fi
 
 if [ ! -d ./mocha-suv/docker/fs/usr/lib/mocha/oms ]; then
diff --git a/docker-run b/docker-run
index 7eaf8f6..54c9edb 100755
--- a/docker-run
+++ b/docker-run
@@ -1,8 +1,9 @@
 #!/bin/bash
 
 USE_SSL=false
+AUTO_LAUNCH=true
 
-vars=$(getopt -o p:sr --long port:,enable-ssh,rebuild -- "$@")
+vars=$(getopt -o p:sr --long 'port:,enable-ssh,rebuild,export-vars' -- "$@")
 if [ $? -ne 0 ]; then
 
 	echo "usage: docker-run [-r, --rebuild] [-p, --port PORTFORWARD] [-s, --enable-ssh]"
@@ -14,6 +15,7 @@ eval set -- "$vars"
 PORT_FORWARD=""
 ENABLE_SSH=""
 BUILD_OPTS=""
+EXPORT_VARS=0
 
 for opt; do
 
@@ -30,6 +32,10 @@ for opt; do
 			BUILD_OPTS+=" --rebuild"
 			shift
 			;;
+		--export-vars)
+			EXPORT_VARS=1
+			shift
+			;;
 	esac
 
 done
@@ -113,4 +119,22 @@ if [ "$ENABLE_SSH" == "true" ]; then
 	docker container exec $SUV_NAME /usr/lib/mocha/create_suv_users
 	docker container exec $SUV_NAME service ssh start
 
+	docker container exec $SUV_NAME cat /etc/mocha/passwd
+
+fi
+
+if [ $EXPORT_VARS -eq 1 ]; then
+
+	export MOCHA_NEW_SUV_NAME=$SUV_NAME
+
+	if [ "$ENABLE_SSH" == "true" ]; then
+		export MOCHA_NEW_SUV_PASSWORD_WEBMASTER=$(docker container exec $SUV_NAME cat /etc/mocha/passwd | grep 'webmaster: ' | sed -e 's/webmaster: //g')
+	fi
+
+fi
+
+if [ "$AUTO_LAUNCH" == "true" ]; then
+
+	xdg-open https://$SUV_NAME$SUV_DOMAINNAME
+
 fi