offen/docker-volume-backup
2
0
Fork 0
mirror of https://github.com/offen/docker-volume-backup.git synced 2024-09-19 21:20:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

use full filepath when pruning local backups

Browse Source
This commit is contained in:
Frederik Ring 2021-08-23 09:10:49 +02:00
parent 7086c6e645
commit f4f4fa9e74
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/backup/main.go
View File

@ -426,7 +426,7 @@ func (s *script) pruneOldBackups() error {
) )
} }
var matches []os.FileInfo var matches []string
for _, candidate := range candidates { for _, candidate := range candidates {
fi, err := os.Stat(candidate) fi, err := os.Stat(candidate)
if err != nil { if err != nil {
@ -438,14 +438,14 @@ func (s *script) pruneOldBackups() error {
} }
if fi.ModTime().Before(deadline) { if fi.ModTime().Before(deadline) {
matches = append(matches, fi) matches = append(matches, candidate)
} }
} }
if len(matches) != 0 && len(matches) != len(candidates) { if len(matches) != 0 && len(matches) != len(candidates) {
var errors []error var errors []error
for _, candidate := range matches { for _, candidate := range matches {
if err := os.Remove(candidate.Name()); err != nil { if err := os.Remove(candidate); err != nil {
errors = append(errors, err) errors = append(errors, err)
} }
} }

2
test/compose/docker-compose.yml
View File

@ -27,8 +27,8 @@ services:
BACKUP_CRON_EXPRESSION: 0 0 5 31 2 ? BACKUP_CRON_EXPRESSION: 0 0 5 31 2 ?
BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-7} BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-7}
BACKUP_PRUNING_LEEWAY: 5s BACKUP_PRUNING_LEEWAY: 5s
BACKUP_PRUNING_PREFIX: test
GPG_PASSPHRASE: 1234secret GPG_PASSPHRASE: 1234secret
# BACKUP_PRUNING_PREFIX: test
volumes: volumes:
- ./local:/archive - ./local:/archive
- app_data:/backup/app_data:ro - app_data:/backup/app_data:ro