From 39b7cd608c8d66f5c5e935d5fd9b3ea3b17debcd Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Tue, 27 Dec 2016 15:22:41 +0000
Subject: [PATCH] Added Docker stuff; corrected usage message.

---
 buildall.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/buildall.sh b/buildall.sh
index 0eabd8e..2f19975 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -72,8 +72,9 @@ if [ $# -lt 1 ]
 then
 	cat <<-EOF 1>&2
 	Usage:
-      -archive           Create a tar archive of the current state of the source.
-	  -build             Build all components and commit to master.
+    -archive           Create a tar archive of the current state of the source.
+	  -build             Build all components, commit and push to origin.
+    -docker            Build and push a Docker image.
 	  -email [ADDRESS]   Your email address, to be recorded in the build signature.
 	  -fullname [NAME]   Your full name, to be recorded in the build signature.
 	  -pull				 Pull from remote git repository
@@ -87,12 +88,14 @@ fi
 while (( "$#" ))
 do
 	case $1 in
-    	-a|-archive)
-      		archive="TRUE";;
+    -a|-archive)
+      	archive="TRUE";;
 		-b|-build)
 			# 'build' is the expected normal case.
 			trial="FALSE";
 			;;
+    -d|-docker)
+      docker="TRUE";;
 		-e|-email)
 			shift;
 			email=$1;;
@@ -126,7 +129,7 @@ do
 	shift
 done
 
-echo "Trial: ${trial}; email: ${email}; fullname ${fullname}; release: ${release}; webapps: $webappsdir"
+echo "Trial: ${trial}; docker: ${docker}; email: ${email}; fullname ${fullname}; release: ${release}; webapps: $webappsdir"
 
 ls mw-* > /dev/null 2>&1
 if [ $? -ne 0 ]
@@ -200,12 +203,18 @@ do
 	# probably deploy it to local Tomcat for test
 	if [ "${dir}" = "mw-ui" -a "${webappsdir}" != "" ]
 	then
-    	lein ring uberwar
+    lein ring uberwar
 		sudo cp target/microworld.war "${webappsdir}"
 		echo "Deployed new WAR file to local Tomcat at ${webappsdir}"
 	fi
 
-		# Then unset manifest properties prior to committing.
+  if [ "${dir}" = "mw-ui" -a "${docker}" = "TRUE" ]
+  then
+    lein docker build
+    lein docker push
+  fi
+
+	# Then unset manifest properties prior to committing.
 	cat project.clj > ${tmp}/project.bak.2
 	setup-build-sig
 	sed -f ${tmp}/manifest.sed ${tmp}/project.bak.2 > project.clj