diff --git a/cmd/root.go b/cmd/root.go index c5d1d12..b610e40 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" ) -var APP_VERSION = "1.3.0" +var APP_VERSION = "1.3.1" // rootCmd represents the base command when called without any subcommands var rootCmd = &cobra.Command{ diff --git a/utils/config.go b/utils/config.go index 3a6b7f6..3a37c69 100644 --- a/utils/config.go +++ b/utils/config.go @@ -102,7 +102,7 @@ type CorgiCompose struct { DatabaseServices []DatabaseService Services []Service Required []Required - // cannot combine from one commands struct, so have to repeated + // cannot combine from one common struct (yaml serialization), so have to repeat Init []string `yaml:"init,omitempty"` BeforeStart []string `yaml:"beforeStart,omitempty"` Start []string `yaml:"start,omitempty"` @@ -115,11 +115,13 @@ type CorgiComposeYaml struct { DatabaseServices map[string]DatabaseService `yaml:"db_services"` Services map[string]Service `yaml:"services"` Required map[string]Required `yaml:"required"` - // cannot combine from one commands struct, so have to repeated + // cannot combine from one common struct (yaml serialization), so have to repeat Init []string `yaml:"init,omitempty"` BeforeStart []string `yaml:"beforeStart,omitempty"` Start []string `yaml:"start,omitempty"` AfterStart []string `yaml:"afterStart,omitempty"` + + UseDocker bool `yaml:"useDocker,omitempty"` } var CorgiComposePath string @@ -153,6 +155,7 @@ func GetCorgiServices(cobra *cobra.Command) (*CorgiCompose, error) { corgi.BeforeStart = corgiYaml.BeforeStart corgi.Start = corgiYaml.Start corgi.AfterStart = corgiYaml.AfterStart + corgi.UseDocker = corgiYaml.UseDocker dbServicesData := corgiYaml.DatabaseServices