From 3e5e661646039dbe078075512303601051b2530c Mon Sep 17 00:00:00 2001 From: volodymyr Date: Sat, 31 May 2025 21:01:17 +0300 Subject: [PATCH] Merge user bulk commands to the default one --- pkg/config/app_config.go | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 9c0ad474..b12ddaab 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -577,10 +577,28 @@ func loadUserConfig(configDir string, base *UserConfig) (*UserConfig, error) { return nil, err } - if err := yaml.Unmarshal(content, base); err != nil { + tempConfig := &UserConfig{} + if err := yaml.Unmarshal(content, tempConfig); err != nil { 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 }