fix(musare.sh): docker-compose files not consistently handled

musare.sh

@@ -40,6 +40,15 @@ if [[ ! -x "$(command -v ${docker})" || ! -x "$(command -v ${dockerCompose})" ]]
     exit 1
 fi
 
+composeFiles="-f docker-compose.yml"
+if [[ ${CONTAINER_MODE} == "dev" ]]; then
+    composeFiles="${composeFiles} -f docker-compose.dev.yml"
+fi
+if [[ -f docker-compose.override.yml ]]; then
+    composeFiles="${composeFiles} -f docker-compose.override.yml"
+fi
+dockerCompose="${dockerCompose} ${composeFiles}"
+
 handleServices()
 {
     validServices=(backend frontend mongo redis)
@@ -79,25 +88,17 @@ runDockerCommand()
                 servicesString=${servicesString:2}
             fi
 
-            composeFiles="-f docker-compose.yml"
-            if [[ ${CONTAINER_MODE} == "dev" ]]; then
-                composeFiles="${composeFiles} -f docker-compose.dev.yml"
-            fi
-            if [[ -f docker-compose.override.yml ]]; then
-                composeFiles="${composeFiles} -f docker-compose.override.yml"
-            fi
-
             if [[ ${2} == "stop" || ${2} == "restart" ]]; then
                 # shellcheck disable=SC2086
-                ${dockerCompose} ${composeFiles} stop ${servicesString}
+                ${dockerCompose} stop ${servicesString}
             fi
             if [[ ${2} == "start" || ${2} == "restart" ]]; then
                 # shellcheck disable=SC2086
-                ${dockerCompose} ${composeFiles} up -d ${servicesString}
+                ${dockerCompose} up -d ${servicesString}
             fi
             if [[ ${2} == "pull" || ${2} == "build" || ${2} == "ps" || ${2} == "logs" ]]; then
                 # shellcheck disable=SC2086
-                ${dockerCompose} ${composeFiles} "${2}" ${servicesString}
+                ${dockerCompose} "${2}" ${servicesString}
             fi
 
             exitValue=$?
@@ -190,7 +191,7 @@ case $1 in
                 # shellcheck disable=SC2086
                 runDockerCommand "$(basename "$0")" stop ${servicesString:2}
                 # shellcheck disable=SC2086
-                ${dockerCompose} rm -v --force ${servicesString:2}
+                ${dockerCompose} rm -v --force ${servicesString}
                 if [[ "${servicesString:2}" == *redis* && -d $REDIS_DATA_LOCATION ]]; then
                     rm -rf "${REDIS_DATA_LOCATION}"
                 fi