root/scripts/backup.sh

@@ -230,26 +230,23 @@ function cleanup {
 function operateDocker {
 # determine action to take
 if [ "$1" = "stop" ]; then
-    containerName="$(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 }}' \
-        $containerName)
+        ${COMPOSE_PROJECT_NAME}_${2}-mailcow_1)
     # verify clean stop (exit code 0)
     dockerResultExit=$(docker inspect -f '{{ .State.ExitCode }}' \
-        $containerName)
+        ${COMPOSE_PROJECT_NAME}_${2}-mailcow_1)
 elif [ "$1" = "start" ]; then
     echo -e "${op}[$(stamp)] Starting ${2}-mailcow container...${normal}" \
         >> "$logFile"
     docker-compose start ${2}-mailcow 2>> "$logFile"
     # verify
-    containerName="$(docker ps --format '{{.Names}}' --filter name=${COMPOSE_PROJECT_NAME}_${2}-mailcow_1)"
     dockerResultState=$(docker inspect -f '{{ .State.Running }}' \
-        $containerName)
+        ${COMPOSE_PROJECT_NAME}_${2}-mailcow_1)
 fi
 }
 
@@ -260,7 +257,7 @@ fi
 
 # store the logfile in the same directory as this script using the script's name
 # with the extension .log
-scriptPath="$( cd "$( dicontainerName "${BASH_SOURCE[0]}" )" && pwd )"
+scriptPath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 scriptName="$( basename ${0} )"
 logFile="$scriptPath/${scriptName%.*}.log"