From 25c6b407a646955d2ab7bc4e177c20f35f954701 Mon Sep 17 00:00:00 2001 From: hockeymikey Date: Sat, 7 Sep 2019 12:33:54 -0500 Subject: [PATCH] Ensure non-exactly named services are found My naming scheme for my mailcown was like -mailcow_1_k8bdj9op so the script never found them. This ensures they do. --- root/scripts/backup.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/root/scripts/backup.sh b/root/scripts/backup.sh index 9256fc7..706fa91 100644 --- a/root/scripts/backup.sh +++ b/root/scripts/backup.sh @@ -230,23 +230,26 @@ function cleanup { function operateDocker { # determine action to take if [ "$1" = "stop" ]; then + rName="$(docker ps --format '{{.Names}}' --filter name=${COMPOSE_PROJECT_NAME}_${2}-mailcow_1)" + echo -e "${op}[$(stamp)] Stopping ${2}-mailcow container...${normal}" \ >> "$logFile" docker-compose stop --timeout ${dockerStopTimeout} ${2}-mailcow \ 2>> "$logFile" # verify container stopped (should return true) dockerResultState=$(docker inspect -f '{{ .State.Running }}' \ - ${COMPOSE_PROJECT_NAME}_${2}-mailcow_1) + $rName) # verify clean stop (exit code 0) dockerResultExit=$(docker inspect -f '{{ .State.ExitCode }}' \ - ${COMPOSE_PROJECT_NAME}_${2}-mailcow_1) + $rName) elif [ "$1" = "start" ]; then echo -e "${op}[$(stamp)] Starting ${2}-mailcow container...${normal}" \ >> "$logFile" docker-compose start ${2}-mailcow 2>> "$logFile" # verify + rName="$(docker ps --format '{{.Names}}' --filter name=${COMPOSE_PROJECT_NAME}_${2}-mailcow_1)" dockerResultState=$(docker inspect -f '{{ .State.Running }}' \ - ${COMPOSE_PROJECT_NAME}_${2}-mailcow_1) + $rName) fi }