mafyuh/Auto-Homelab
mafyuh/Auto-Homelab
Archived
1
1
Fork 0
Code Issues 5 Pull requests 10 Projects 1 Wiki Activity Actions

Update scripts/dccd2.sh

Browse source
This commit is contained in:
Matt Reeves 2024-05-04 02:13:20 +00:00
parent 4ef838385d
commit 2ec93866e9
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/dccd2.sh
View file

@ -79,9 +79,6 @@ update_compose_files() {
# Check if docker-compose.yml was changed in this directory # Check if docker-compose.yml was changed in this directory
if echo "$changed_files" | grep -q "$folder/docker-compose.yml"; then if echo "$changed_files" | grep -q "$folder/docker-compose.yml"; then
# Calculate hash of docker-compose.yml before pull
before_pull_hash=$(md5sum "$folder/docker-compose.yml" | awk '{ print $1 }')
# Pull any changes in the Git repository # Pull any changes in the Git repository
if ! git pull --quiet origin "$REMOTE_BRANCH"; then if ! git pull --quiet origin "$REMOTE_BRANCH"; then
log_message "ERROR: Unable to pull changes from the remote repository (the server may be offline or unreachable)" log_message "ERROR: Unable to pull changes from the remote repository (the server may be offline or unreachable)"
@ -89,11 +86,10 @@ update_compose_files() {
exit 1 exit 1
fi fi
# Calculate hash of docker-compose.yml after pull # Check if the docker-compose.yml file was modified after the pull
after_pull_hash=$(md5sum "$folder/docker-compose.yml" | awk '{ print $1 }') if git diff --quiet --exit-code "$folder/docker-compose.yml"; then
log_message "INFO: No changes in $folder/docker-compose.yml"
# Compare hashes to determine if the file was modified else
if [ "$before_pull_hash" != "$after_pull_hash" ]; then
# Go into the directory # Go into the directory
cd "$folder" || { log_message "ERROR: Failed to enter directory $folder"; send_notification "Script Error" "Failed to update compose files: Failed to enter directory $folder"; continue; } cd "$folder" || { log_message "ERROR: Failed to enter directory $folder"; send_notification "Script Error" "Failed to update compose files: Failed to enter directory $folder"; continue; }
@ -103,10 +99,9 @@ update_compose_files() {
# Go back to the original directory # Go back to the original directory
cd "$dir" || { log_message "ERROR: Failed to return to directory $dir"; send_notification "Script Error" "Failed to update compose files: Failed to return to directory $dir"; exit 1; } cd "$dir" || { log_message "ERROR: Failed to return to directory $dir"; send_notification "Script Error" "Failed to update compose files: Failed to return to directory $dir"; exit 1; }
else
log_message "INFO: No changes in $folder/docker-compose.yml"
fi fi
fi fi
done done
else else
log_message "STATE: Hashes match, so nothing to do" log_message "STATE: Hashes match, so nothing to do"