Added Docker stuff; corrected usage message.
This commit is contained in:
parent
f1b35dc948
commit
39b7cd608c
13
buildall.sh
13
buildall.sh
|
@ -73,7 +73,8 @@ 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.
|
||||
-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
|
||||
|
@ -93,6 +94,8 @@ do
|
|||
# '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 ]
|
||||
|
@ -205,6 +208,12 @@ do
|
|||
echo "Deployed new WAR file to local Tomcat at ${webappsdir}"
|
||||
fi
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue