mirror of
https://github.com/mag37/dockcheck.git
synced 2026-04-19 19:07:50 +00:00
Moved the backup - cleanup to always trigger if -b option is usd. Added -p&-b warning.
This commit is contained in:
27
dockcheck.sh
27
dockcheck.sh
@@ -176,6 +176,7 @@ if [[ -n "$BackupForDays" ]]; then
|
|||||||
printf "-b argument given (%s) is not a number.\n" "$BackupForDays"
|
printf "-b argument given (%s) is not a number.\n" "$BackupForDays"
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
[[ "$AutoPrune" == true ]] && printf "%bWARNING: When -b option is used, -p has no function.%b\n" "$c_yellow" "$c_reset"
|
||||||
fi
|
fi
|
||||||
if [[ -n "$CollectorTextFileDirectory" ]]; then
|
if [[ -n "$CollectorTextFileDirectory" ]]; then
|
||||||
if ! [[ -d $CollectorTextFileDirectory ]]; then
|
if ! [[ -d $CollectorTextFileDirectory ]]; then
|
||||||
@@ -662,6 +663,19 @@ if [[ -n "${GotUpdates:-}" ]]; then
|
|||||||
fi
|
fi
|
||||||
printf "\n%bAll updates done!%b\n" "$c_green" "$c_reset"
|
printf "\n%bAll updates done!%b\n" "$c_green" "$c_reset"
|
||||||
|
|
||||||
|
# Trigger pruning only when backup-function is not used
|
||||||
|
if [[ -z "${BackupForDays:-}" ]]; then
|
||||||
|
if [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then printf "\n"; read -rep "Would you like to prune all dangling images? y/[n]: " AutoPrune; fi
|
||||||
|
if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then printf "\nAuto pruning.."; docker image prune -f; fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
printf "\nNo updates installed.\n"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
printf "\nNo updates available.\n"
|
||||||
|
fi
|
||||||
|
|
||||||
# Clean up old backup image tags if -b is used
|
# Clean up old backup image tags if -b is used
|
||||||
if [[ -n "${BackupForDays:-}" ]]; then
|
if [[ -n "${BackupForDays:-}" ]]; then
|
||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
@@ -680,19 +694,8 @@ if [[ -n "${GotUpdates:-}" ]]; then
|
|||||||
if [[ "$CleanupCount" == 0 ]]; then
|
if [[ "$CleanupCount" == 0 ]]; then
|
||||||
printf "\nNo backup images to remove.\n"
|
printf "\nNo backup images to remove.\n"
|
||||||
else
|
else
|
||||||
printf "\n%b%s%b backup images removed.%b\n" "$c_green" "$CleanupCount" "$c_teal" "$c_reset"
|
printf "\n%b%s%b backup removed.%b\n" "$c_green" "$CleanupCount" "$c_teal" "$c_reset"
|
||||||
docker image prune -f
|
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
if [[ "$AutoPrune" == false ]] && [[ "$AutoMode" == false ]]; then printf "\n"; read -rep "Would you like to prune all dangling images? y/[n]: " AutoPrune; fi
|
|
||||||
if [[ "$AutoPrune" == true ]] || [[ "$AutoPrune" =~ [yY] ]]; then printf "\nAuto pruning.."; docker image prune -f; fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
printf "\nNo updates installed.\n"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
printf "\nNo updates available.\n"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
Reference in New Issue
Block a user