From d41498c1f8af8dd85ef6c7d12ec15be0a260438c Mon Sep 17 00:00:00 2001 From: Chris King Date: Wed, 22 Jan 2025 18:21:24 -0800 Subject: [PATCH] Explicitly check each exclusion in array instead of relying on implicit concatenation. Add -d to docker compose up Add --remove-orphans to docker compose down --- post-backup-all-docker-compose-up.sh | 10 ++++++---- pre-backup-all-docker-compose-down.sh | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/post-backup-all-docker-compose-up.sh b/post-backup-all-docker-compose-up.sh index 5fcbe02..ab380c4 100755 --- a/post-backup-all-docker-compose-up.sh +++ b/post-backup-all-docker-compose-up.sh @@ -9,14 +9,16 @@ do folder=$(basename "$dir") # Skip if folder is in the exclusions array - if [[ " ${exclusions[@]} " =~ " $folder " ]]; then - continue - fi + for exclusion in "${exclusions[@]}"; do + if [[ "$folder" = "$exclusion" ]]; then + continue 2 + fi + done cd "$dir" || { echo "Failed to enter directory: $dir" continue } - docker compose up + docker compose up -d done diff --git a/pre-backup-all-docker-compose-down.sh b/pre-backup-all-docker-compose-down.sh index c61e888..5b25aee 100755 --- a/pre-backup-all-docker-compose-down.sh +++ b/pre-backup-all-docker-compose-down.sh @@ -9,14 +9,16 @@ do folder=$(basename "$dir") # Skip if folder is in the exclusions array - if [[ " ${exclusions[@]} " =~ " $folder " ]]; then - continue - fi + for exclusion in "${exclusions[@]}"; do + if [[ "$folder" = "$exclusion" ]]; then + continue 2 + fi + done cd "$dir" || { echo "Failed to enter directory: $dir" continue } - docker compose down + docker compose down --remove-orphans done