wip

* build_and_run.sh now should actually start container properly
* update_loop.sh has gps_minder in it's executable list now

busunit/scripts/update_loop.sh

@@ -27,7 +27,7 @@ export BASEDIR="/home/bus"
 generate_ssh_targets
 
 supervisor_pidfile="/tmp/client_supervisor.pid"
-supervisor_args="$BASEDIR/bin/ipc_server $BASEDIR/bin/billdb $BASEDIR/bin/piu_minder $BASEDIR/bin/diu_minder $BASEDIR/bin/passdb $BASEDIR/bin/avls $BASEDIR/bin/paddlemgr"
+supervisor_args="$BASEDIR/bin/ipc_server $BASEDIR/bin/billdb $BASEDIR/bin/piu_minder $BASEDIR/bin/diu_minder $BASEDIR/bin/passdb $BASEDIR/bin/avls $BASEDIR/bin/paddlemgr $BASEDIR/bin/gps_minder"
 
 eqnum_file="$EQUIP_NUM_FILE"
 checksum_path="$CHECKSUM_AND_VERSION_PATH"

server/docker/build_and_run.sh

@@ -9,7 +9,7 @@ export UPDATE_DAEMON_PORT="8377"
 
 docker build --no-cache -t popufare .
 
-docker run -d \
+docker run \
   -p 8080:80 \
   -p 4430:443 \
   -p $SSH_DEFAULT_PORT:22 \
@@ -18,20 +18,6 @@ docker run -d \
   -p $BILLDB_DAEMON_PORT:$BILLDB_DAEMON_PORT \
   -p $HELLO_DAEMON_PORT:$HELLO_DAEMON_PORT \
   -p $UPDATE_DAEMON_PORT:$UPDATE_DAEMON_PORT \
-  popufare bus
-
-## for interactive debugging...
-##
-# docker run --net=host -it popufare \
-#  -p 8080:80 \
-#  -p 4430:443 \
-#  -p $SSH_DEFAULT_PORT:22 \
-#  -p $AVLS_DAEMON_PORT:$AVLS_DAEMON_PORT \
-#  -p $PASSDB_DAEMON_PORT:$PASSDB_DAEMON_PORT \
-#  -p $BILLDB_DAEMON_PORT:$BILLDB_DAEMON_PORT \
-#  -p $HELLO_DAEMON_PORT:$HELLO_DAEMON_PORT \
-#  -p $UPDATE_DAEMON_PORT:$UPDATE_DAEMON_PORT \
-#  bus
-
+  -t -d popufare
 
 docker ps