mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-25 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3e5e661646 into 7e7aadc207

Browse source
This commit is contained in:
Vlom 2026-04-19 15:25:30 -05:00 • committed by GitHub
commit c64d0d7151
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/config/app_config.go
View file

@ -579,10 +579,28 @@ func loadUserConfig(configDir string, base *UserConfig) (*UserConfig, error) {
return nil, err return nil, err
} }
if err := yaml.Unmarshal(content, base); err != nil { tempConfig := &UserConfig{}
if err := yaml.Unmarshal(content, tempConfig); err != nil {
return nil, err return nil, err
} }
// Merge bulk commands instead of replacing them
if len(tempConfig.BulkCommands.Services) > 0 {
base.BulkCommands.Services = append(base.BulkCommands.Services, tempConfig.BulkCommands.Services...)
}
if len(tempConfig.BulkCommands.Containers) > 0 {
base.BulkCommands.Containers = append(base.BulkCommands.Containers, tempConfig.BulkCommands.Containers...)
}
if len(tempConfig.BulkCommands.Images) > 0 {
base.BulkCommands.Images = append(base.BulkCommands.Images, tempConfig.BulkCommands.Images...)
}
if len(tempConfig.BulkCommands.Volumes) > 0 {
base.BulkCommands.Volumes = append(base.BulkCommands.Volumes, tempConfig.BulkCommands.Volumes...)
}
if len(tempConfig.BulkCommands.Networks) > 0 {
base.BulkCommands.Networks = append(base.BulkCommands.Networks, tempConfig.BulkCommands.Networks...)
}
return base, nil return base, nil
} }