JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: docker: fix: not all find's are made equal, back to -mtime +1 (full 24-hour period needed for match)

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-27 20:03:23 +01:00
parent b91d752aa6
commit 41d7d0155e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/functions/host/docker.sh
View File

@@ -281,8 +281,8 @@ function docker_cli_build_dockerfile() {
run_host_command_logged mkdir -p "${docker_marker_dir}" run_host_command_logged mkdir -p "${docker_marker_dir}"
# Find files under "${SRC}"/cache/docker that are older than 12 hours. # Find files under "${SRC}"/cache/docker that are older than a full 24-hour period.
EXPIRED_MARKER="$(find "${docker_marker_dir}" -type f -mtime +12h -exec echo -n {} \;)" EXPIRED_MARKER="$(find "${docker_marker_dir}" -type f -mtime +1 -exec echo -n {} \;)"
display_alert "Expired marker?" "${EXPIRED_MARKER}" "debug" display_alert "Expired marker?" "${EXPIRED_MARKER}" "debug"
if [[ "x${EXPIRED_MARKER}x" != "xx" ]]; then if [[ "x${EXPIRED_MARKER}x" != "xx" ]]; then

2
lib/functions/logging/runners.sh
View File

@@ -196,7 +196,7 @@ function run_host_command_logged_raw() {
echo -e "${bright_red_color:-}-->--> command failed with error code ${exit_code} after $((SECONDS - seconds_start)) seconds${normal_color:-}" >> "${CURRENT_LOGFILE}" echo -e "${bright_red_color:-}-->--> command failed with error code ${exit_code} after $((SECONDS - seconds_start)) seconds${normal_color:-}" >> "${CURRENT_LOGFILE}"
fi fi
# @TODO: send these _ONLY_ to logfile. there's enough on screen already... # send these _ONLY_ to logfile. there's enough on screen already...
display_alert_skip_screen=1 display_alert "stacktrace for failed command" "exit code ${exit_code}:$*\n$(stack_color="${magenta_color:-}" show_caller_full)" "wrn" display_alert_skip_screen=1 display_alert "stacktrace for failed command" "exit code ${exit_code}:$*\n$(stack_color="${magenta_color:-}" show_caller_full)" "wrn"
# Obtain extra info about error, eg, log files produced, extra messages set by caller, etc. # Obtain extra info about error, eg, log files produced, extra messages set by caller, etc.