offen/docker-volume-backup
2
0
Fork 0
mirror of https://github.com/offen/docker-volume-backup.git synced 2024-11-10 00:30:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conf files should expand env vars (#363)

Browse Source
This commit is contained in:
Frederik Ring 2024-02-15 12:04:44 +01:00 committed by GitHub
parent 37f9bd9a8f
commit a01fc3df3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/backup/config_provider.go
View File

@ -69,7 +69,11 @@ func loadEnvFiles(directory string) ([]configFile, error) {
continue continue
} }
p := filepath.Join(directory, item.Name()) p := filepath.Join(directory, item.Name())
envFile, err := godotenv.Read(p) f, err := os.ReadFile(p)
if err != nil {
return nil, fmt.Errorf("loadEnvFiles: error reading %s: %w", item.Name(), err)
}
envFile, err := godotenv.Unmarshal(os.ExpandEnv(string(f)))
if err != nil { if err != nil {
return nil, fmt.Errorf("loadEnvFiles: error reading config file %s: %w", p, err) return nil, fmt.Errorf("loadEnvFiles: error reading config file %s: %w", p, err)
} }

2
test/confd/01backup.env
View File

@ -1,2 +1,2 @@
NAME="conf" NAME="$EXPANSION_VALUE"
BACKUP_CRON_EXPRESSION="*/1 * * * *" BACKUP_CRON_EXPRESSION="*/1 * * * *"

1
test/confd/docker-compose.yml
View File

@ -7,6 +7,7 @@ services:
environment: environment:
BACKUP_FILENAME: $$NAME.tar.gz BACKUP_FILENAME: $$NAME.tar.gz
BACKUP_FILENAME_EXPAND: 'true' BACKUP_FILENAME_EXPAND: 'true'
EXPANSION_VALUE: conf
volumes: volumes:
- ${LOCAL_DIR:-./local}:/archive - ${LOCAL_DIR:-./local}:/archive
- app_data:/backup/app_data:ro - app_data:/backup/app_data:ro