From 380511d3bb5ff95422f269621eb49484b231199a Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Wed, 8 Mar 2023 10:37:37 +0100 Subject: [PATCH] Don't delete docker images if BK is not running --- bridgehead | 3 ++- lib/functions.sh | 3 ++- lib/update-bridgehead.sh | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bridgehead b/bridgehead index 60f4aa9..f2eaa6b 100755 --- a/bridgehead +++ b/bridgehead @@ -73,7 +73,8 @@ case "$ACTION" in exec $COMPOSE -p bridgehead-$PROJECT -f ./$PROJECT/docker-compose.yml $OVERRIDE down ;; is-running) - exit bk_is_running + bk_is_running + exit $? ;; update) loadVars diff --git a/lib/functions.sh b/lib/functions.sh index 6954cd2..836ffcc 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -170,9 +170,10 @@ function retry { } function bk_is_running { + detectCompose RUNNING="$($COMPOSE -p bridgehead-$PROJECT -f ./$PROJECT/docker-compose.yml $OVERRIDE ps -q)" NUMBEROFRUNNING=$(echo "$RUNNING" | wc -l) - if [ $NUMBEROFRUNNING -gt 0 ]; then + if [ $NUMBEROFRUNNING -ge 2 ]; then return 0 else return 1 diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index c53b731..bce720d 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -4,10 +4,15 @@ source lib/functions.sh AUTO_HOUSEKEEPING=${AUTO_HOUSEKEEPING:-true} if [ "$AUTO_HOUSEKEEPING" == "true" ]; then - A="Performing automatic maintenance: Cleaning docker images." + A="Performing automatic maintenance: " + if bk_is_running; then + A="$A Cleaning docker images." + docker system prune -a -f + else + A="$A Not cleaning docker images since BK is not running." + fi hc_send log "$A" log INFO "$A" - docker system prune -a -f else log WARN "Automatic housekeeping disabled (variable AUTO_HOUSEKEEPING != \"true\")" fi