mirrors/docker-db-backup
1
0
Fork 0
mirror of https://github.com/tiredofit/docker-db-backup.git synced 2025-12-21 13:23:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Release 4.0.27 - See CHANGELOG.md

Browse Source
This commit is contained in:
dave@tiredofit.ca
2023-12-04 07:00:39 -08:00
parent d58b27d5ef
commit ccda858b18
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
## 4.0.27 2023-12-04 <dave at tiredofit dot ca>
### Changed
- Switch to using actual crontab for cron expressions
## 4.0.26 2023-11-30 <dave at tiredofit dot ca> ## 4.0.26 2023-11-30 <dave at tiredofit dot ca>
### Added ### Added

6
install/assets/dbbackup/template-dbbackup/run
View File

@@ -22,10 +22,8 @@ if [[ "${MODE,,}" =~ "standalone" ]] || [ "${MODE,,}" = "manual" ] || [ "${1,,}"
backup_job_backup_begin=+0 backup_job_backup_begin=+0
else else
silent sleep {{BACKUP_NUMBER}} silent sleep {{BACKUP_NUMBER}}
set -x
time_last_run=0 time_last_run=0
time_current=$(date +'%s') time_current=$(date +'%s')
set +x
if [[ "${backup_job_backup_begin}" =~ ^\+(.*)$ ]]; then if [[ "${backup_job_backup_begin}" =~ ^\+(.*)$ ]]; then
print_debug "BACKUP_BEGIN is a jump of minute starting with +" print_debug "BACKUP_BEGIN is a jump of minute starting with +"
timer plusvalue timer plusvalue
@@ -45,8 +43,8 @@ else
backup_job_backup_begin=${backup_job_backup_begin//\'/} backup_job_backup_begin=${backup_job_backup_begin//\'/}
timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}" timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}"
else else
echo "${backup_job_backup_begin} /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}} now" > /tmp/.container/cron/{{BACKUP_NUMBER}}-backup echo "${backup_job_backup_begin} /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}/run now" > /tmp/.container/cron/{{BACKUP_NUMBER}}-backup
crontab -l | { cat; echo "${backup_job_backup_begin} /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}} now"; } | crontab - crontab -l | { cat; echo "${backup_job_backup_begin} /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}/run now"; } | crontab -
s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}} s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}
exit 0 exit 0
fi fi

3
install/assets/functions/10-db-backup
View File

@@ -2000,12 +2000,13 @@ timer() {
fi fi
cron_parsed=0 cron_parsed=0
done done
set -x
local cron_future=$(date --date="${cron_next_year}-$(printf "%02d" ${cron_next_month})-$(printf "%02d" ${cron_next_day_of_month})T$(printf "%02d" ${cron_next_hour}):$(printf "%02d" ${cron_next_minute}):00" "+%s") local cron_future=$(date --date="${cron_next_year}-$(printf "%02d" ${cron_next_month})-$(printf "%02d" ${cron_next_day_of_month})T$(printf "%02d" ${cron_next_hour}):$(printf "%02d" ${cron_next_minute}):00" "+%s")
local cron_future_difference=$(( cron_future - cron_compare_seconds )) local cron_future_difference=$(( cron_future - cron_compare_seconds ))
time_cron=true time_cron=true
time_wait="${cron_future_difference}" time_wait="${cron_future_difference}"
time_future="${cron_future}" time_future="${cron_future}"
set +x
;; ;;
datetime) datetime)
time_begin=$(date -d "${backup_job_backup_begin}" +%s) time_begin=$(date -d "${backup_job_backup_begin}" +%s)