diff --git a/bridgehead b/bridgehead index 227a0d7..60f4aa9 100755 --- a/bridgehead +++ b/bridgehead @@ -66,11 +66,14 @@ case "$ACTION" in checkRequirements hc_send log "Bridgehead $PROJECT startup: Requirements checked out. Now starting bridgehead ..." export LDM_LOGIN=$(getLdmPassword) - exec $COMPOSE -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit + exec $COMPOSE -p bridgehead-$PROJECT -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit ;; stop) loadVars - exec $COMPOSE -f ./$PROJECT/docker-compose.yml $OVERRIDE down + exec $COMPOSE -p bridgehead-$PROJECT -f ./$PROJECT/docker-compose.yml $OVERRIDE down + ;; + is-running) + exit bk_is_running ;; update) loadVars diff --git a/lib/functions.sh b/lib/functions.sh index 23fb939..6954cd2 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -34,7 +34,7 @@ checkOwner(){ } printUsage() { - echo "Usage: bridgehead start|stop|update|install|uninstall|enroll PROJECTNAME" + echo "Usage: bridgehead start|stop|is-running|update|install|uninstall|enroll PROJECTNAME" echo "PROJECTNAME should be one of ccp|bbmri" } @@ -169,6 +169,16 @@ function retry { return 0 } +function bk_is_running { + RUNNING="$($COMPOSE -p bridgehead-$PROJECT -f ./$PROJECT/docker-compose.yml $OVERRIDE ps -q)" + NUMBEROFRUNNING=$(echo "$RUNNING" | wc -l) + if [ $NUMBEROFRUNNING -gt 0 ]; then + return 0 + else + return 1 + fi +} + ##Setting Network properties # currently not needed #export HOSTIP=$(MSYS_NO_PATHCONV=1 docker run --rm --add-host=host.docker.internal:host-gateway ubuntu cat /etc/hosts | grep 'host.docker.internal' | awk '{print $1}');