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.20 - See CHANGELOG.md

Browse Source
This commit is contained in:
dave@tiredofit.ca
2023-11-21 15:18:22 -08:00
parent 674a98fcd8
commit 11f55f3d82
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,3 +1,10 @@
## 4.0.20 2023-11-21 <dave at tiredofit dot ca>
### Changed
- Update base image to support S6 Overlay 3.1.6.2 to solve shutdown issues specifically with MODE=MANUAL and MANUAL_RUN_FOREVER=TRUE
- Add some safety nets for Manual scheduling
## 4.0.19 2023-11-20 <dave at tiredofit dot ca> ## 4.0.19 2023-11-20 <dave at tiredofit dot ca>
### Changed ### Changed

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

@@ -16,7 +16,7 @@ fi
trap ctrl_c INT trap ctrl_c INT
if [[ "${MODE,,}" =~ "standalone" ]] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then if [[ "${MODE,,}" =~ "standalone" ]] || [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
print_debug "Detected Manual Mode" print_debug "Detected Manual Mode"
persist=false persist=false
backup_job_backup_begin=+0 backup_job_backup_begin=+0

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

@@ -1160,13 +1160,14 @@ create_schedulers() {
instance=$(printf "%02d" $instance) instance=$(printf "%02d" $instance)
cp -R /assets/dbbackup/template-dbbackup /etc/services.available/dbbackup-"${instance}" cp -R /assets/dbbackup/template-dbbackup /etc/services.available/dbbackup-"${instance}"
sed -i "s|{{BACKUP_NUMBER}}|${instance}|g" /etc/services.available/dbbackup-"${instance}"/run sed -i "s|{{BACKUP_NUMBER}}|${instance}|g" /etc/services.available/dbbackup-"${instance}"/run
if [ "${MODE,,}" = "manual" ] ; then service_stop dbbackup-"${instance}" ; fi
cat <<EOF >> /usr/bin/backup"${instance}"-now cat <<EOF >> /usr/bin/backup"${instance}"-now
#!/bin/bash #!/bin/bash
source /assets/functions/00-container source /assets/functions/00-container
PROCESS_NAME=db-backup${instance} PROCESS_NAME=db-backup${instance}
print_info "Starting Manual Backup for db-backup${instance}" print_info "Starting Manual Backup for db-backup${instance}"
/var/run/s6/legacy-services/dbbackup-${instance}/run now #/var/run/s6/legacy-services/dbbackup-${instance}/run now
/etc/services.available/dbbackup-${instance}/run now
EOF EOF
chmod +x /usr/bin/backup"${instance}"-now chmod +x /usr/bin/backup"${instance}"-now
@@ -1176,11 +1177,11 @@ EOF
cat <<EOF > /usr/bin/backup-now cat <<EOF > /usr/bin/backup-now
#!/bin/bash #!/bin/bash
/usr/bin/backup${instance}-now /usr/bin/backup${instance}-now now
EOF EOF
else else
echo "/usr/bin/backup${instance}-now" >> /usr/bin/backup-now echo "/usr/bin/backup${instance}-now now" >> /usr/bin/backup-now
fi fi
instance=$(echo "${instance} +1" | bc) instance=$(echo "${instance} +1" | bc)