diff --git a/cmd/build.go b/cmd/build.go index e1d66413..7a0b5ee6 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -75,7 +75,7 @@ Build packages specifying multiple definition trees: viper.BindPFlag("compression", cmd.Flags().Lookup("compression")) viper.BindPFlag("nodeps", cmd.Flags().Lookup("nodeps")) viper.BindPFlag("onlydeps", cmd.Flags().Lookup("onlydeps")) - viper.BindPFlag("values", cmd.Flags().Lookup("values")) + util.BindValuesFlags(cmd) viper.BindPFlag("backend-args", cmd.Flags().Lookup("backend-args")) viper.BindPFlag("image-repository", cmd.Flags().Lookup("image-repository")) @@ -101,7 +101,7 @@ Build packages specifying multiple definition trees: all := viper.GetBool("all") compressionType := viper.GetString("compression") imageRepository := viper.GetString("image-repository") - values := viper.GetStringSlice("values") + values := util.ValuesFlags() wait := viper.GetBool("wait") push := viper.GetBool("push") pull := viper.GetBool("pull") diff --git a/cmd/tree/images.go b/cmd/tree/images.go index 8aa0a6d7..40e4a04b 100644 --- a/cmd/tree/images.go +++ b/cmd/tree/images.go @@ -23,6 +23,7 @@ import ( //. "github.com/mudler/luet/pkg/config" "github.com/ghodss/yaml" helpers "github.com/mudler/luet/cmd/helpers" + "github.com/mudler/luet/cmd/util" "github.com/mudler/luet/pkg/compiler" "github.com/mudler/luet/pkg/compiler/backend" "github.com/mudler/luet/pkg/compiler/types/options" @@ -50,6 +51,7 @@ func NewTreeImageCommand() *cobra.Command { if len(args) != 1 { Fatal("Expects one package as parameter") } + util.BindValuesFlags(cmd) viper.BindPFlag("image-repository", cmd.Flags().Lookup("image-repository")) }, @@ -59,6 +61,7 @@ func NewTreeImageCommand() *cobra.Command { treePath, _ := cmd.Flags().GetStringArray("tree") imageRepository := viper.GetString("image-repository") pullRepo, _ := cmd.Flags().GetStringArray("pull-repository") + values := util.ValuesFlags() out, _ := cmd.Flags().GetString("output") if out != "terminal" { @@ -80,6 +83,7 @@ func NewTreeImageCommand() *cobra.Command { luetCompiler := compiler.NewLuetCompiler( compilerBackend, reciper.GetDatabase(), + options.WithBuildValues(values), options.WithPushRepository(imageRepository), options.WithPullRepositories(pullRepo), options.WithSolverOptions(opts), diff --git a/cmd/util/cli.go b/cmd/util/cli.go index 2cd7565e..8a123697 100644 --- a/cmd/util/cli.go +++ b/cmd/util/cli.go @@ -17,6 +17,7 @@ package util import ( "github.com/spf13/cobra" + "github.com/spf13/viper" "github.com/mudler/luet/pkg/config" . "github.com/mudler/luet/pkg/config" @@ -35,6 +36,14 @@ func BindSolverFlags(cmd *cobra.Command) { LuetCfg.Viper.BindPFlag("solver.max_attempts", cmd.Flags().Lookup("solver-attempts")) } +func BindValuesFlags(cmd *cobra.Command) { + viper.BindPFlag("values", cmd.Flags().Lookup("values")) +} + +func ValuesFlags() []string { + return viper.GetStringSlice("values") +} + func SetSystemConfig() { dbpath := LuetCfg.Viper.GetString("system.database_path") rootfs := LuetCfg.Viper.GetString("system.rootfs")