diff --git a/.gitignore b/.gitignore index 74dfed2..b2516a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /backup/ /docker-compose.yml /.do.cfg +/.do-machine.cfg .directory /service /ispc diff --git a/do b/do index e068d9e..b43e3cf 100755 --- a/do +++ b/do @@ -1,16 +1,25 @@ #!/bin/bash -if [ ! -e ./.do.cfg ] ; then - echo "DO_CNAME=ispc" > ./.do.cfg +CFG=./.do.cfg +DMC=./.do-machine.cfg + +if [ ! -e $CFG ] ; then + echo "DO_CNAME=ispc" > $CFG fi + SERVICEVOL=./service -. ./.do.cfg +. $CFG DCN=$DO_CNAME +if [ -f $DMC ] ; then +. $DMC +fi + if [ "$1" = "" ] ; then echo "usage: `basename $0` " + echo " setup []" echo " build ............... build image" echo " up ................. create <$DCN> from image" echo " rm ................. remove <$DCN>" @@ -35,6 +44,30 @@ if [ "$1" = "" ] ; then exit 0 fi +if [ ! -d ./build ] ; then + mkdir -p ./build +fi + + +if [ "$1" = "setup" ] ; then + if [ "$2" = "" ] ; then + echo "settings:" + cat $CFG + if [ -e $DMC ] ; then + cat $DMC + fi + exit 0 + else + sed -i -e "s/^DO_CNAME=.*/DO_CNAME=$2/" $CFG + fi + . $CFG + if [ "$3" != "" ] ; then + docker-machine env $3 + docker-machine env $3 > $DMC + . $DMC + fi +fi + if [ "$1" = "ps" ] ; then docker-compose ps fi