diff --git a/vvv.sh b/vvv.sh index 2e15469..dd3cdea 100755 --- a/vvv.sh +++ b/vvv.sh @@ -81,32 +81,39 @@ if [[ ! $RESTORE == "true" ]]; then scripts fi -COMMAND="sudo docker compose stop" -printf "${COMMAND}\n" -${COMMAND} -if ! ${COMMAND}; then - printf "Services 'docker compose stop' error." - exit 1 -fi -COMMAND="sudo docker compose rm -f" -printf "${COMMAND}\n" -${COMMAND} -if ! ${COMMAND}; then - printf "Services 'docker compose rm' error." - exit 1 -fi +for COMP in docker-compose*.yml; do + COMMAND="sudo docker compose -f $COMP stop" + printf "${COMMAND}\n" + ${COMMAND} + if ! ${COMMAND}; then + printf "Services 'docker compose stop' error." + exit 1 + fi +done + +for COMP in docker-compose*.yml; do + COMMAND="sudo docker compose -f $COMP rm -f" + printf "${COMMAND}\n" + ${COMMAND} + if ! ${COMMAND}; then + printf "Services 'docker compose rm' error." + exit 1 + fi +done if [[ $RESTORE == "true" ]]; then "./docker-restore.sh" else "./docker-backup.sh" if [[ $DOWN = "false" ]]; then - COMMAND="sudo docker compose up -d" - printf "${COMMAND}\n" - if ! ${COMMAND}; then - printf "Services 'up' error." - exit 1 - fi + for COMP in docker-compose*.yml; do + COMMAND="sudo docker compose -f $COMP up -d" + printf "${COMMAND}\n" + if ! ${COMMAND}; then + printf "Services 'up' error." + exit 1 + fi + done fi fi