ensure flags take precedence over cfg

docs/fox.md

@@ -12,11 +12,14 @@ and release your KubeFox Apps.
 ### Options
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -h, --help            help for fox
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -h, --help                       help for fox
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_build.md

@@ -34,10 +34,13 @@ fox build my-component --publish
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_completion.md

@@ -17,10 +17,13 @@ See each sub-command's help for details on how to use the generated script.
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_completion_bash.md

@@ -40,10 +40,13 @@ fox completion bash
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_completion_fish.md

@@ -31,10 +31,13 @@ fox completion fish [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_completion_powershell.md

@@ -28,10 +28,13 @@ fox completion powershell [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_completion_zsh.md

@@ -42,10 +42,13 @@ fox completion zsh [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_config.md

@@ -17,10 +17,13 @@ Use the config subcommand to help setup your local environment.
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_config_setup.md

@@ -15,10 +15,13 @@ fox config setup [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_config_show.md

@@ -15,10 +15,13 @@ fox config show [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_deploy.md

@@ -22,10 +22,13 @@ fox deploy [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_docs.md

@@ -20,10 +20,13 @@ fox docs [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_init.md

@@ -22,10 +22,13 @@ fox init [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_proxy.md

@@ -47,10 +47,13 @@ fox proxy 8080 --virtual-env my-env --app-deployment my-dep
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_publish.md

@@ -27,10 +27,13 @@ fox publish [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_release.md

@@ -43,10 +43,13 @@ fox release v1.2.3 --virtual-env prod
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

docs/fox_version.md

@@ -15,10 +15,13 @@ fox version [flags]
 ### Options inherited from parent commands
 
 ```
-  -a, --app string      path to directory containing KubeFox App
-  -i, --info            enable info output
-  -o, --output string   output format, one of ["json", "yaml"] (default "yaml")
-  -v, --verbose         enable verbose output
+  -a, --app string                 path to directory containing KubeFox App
+  -i, --info                       enable info output
+  -o, --output string              output format, one of ["json", "yaml"] (default "yaml")
+      --registry-address string    address of your container registry
+      --registry-token string      access token for your container registry
+      --registry-username string   username for your container registry
+  -v, --verbose                    enable verbose output
 ```
 
 ### SEE ALSO

internal/config/config.go

@@ -23,6 +23,7 @@ import (
 	"github.com/cli/oauth/device"
 	"github.com/xigxog/fox/internal/log"
 	"github.com/xigxog/fox/internal/utils"
+	kfutils "github.com/xigxog/kubefox/utils"
 	"sigs.k8s.io/yaml"
 )
 
@@ -87,7 +88,15 @@ type ContainerRegistry struct {
 }
 
 func (cfg *Config) IsRegistryLocal() bool {
-	return strings.HasPrefix(cfg.ContainerRegistry.Address, LocalRegistry)
+	return strings.HasPrefix(cfg.GetContainerRegistry().Address, LocalRegistry)
+}
+
+func (cfg *Config) GetContainerRegistry() ContainerRegistry {
+	return ContainerRegistry{
+		Address:  kfutils.First(cfg.Flags.RegistryAddress, cfg.ContainerRegistry.Address),
+		Token:    kfutils.First(cfg.Flags.RegistryToken, cfg.ContainerRegistry.Token),
+		Username: kfutils.First(cfg.Flags.RegistryUsername, cfg.ContainerRegistry.Username),
+	}
 }
 
 func (cfg *Config) Load() {
@@ -234,7 +243,6 @@ func (cfg *Config) setupRegistry() {
 	cfg.ContainerRegistry.Address = utils.InputPrompt("Enter the container registry endpoint you'd like to use", "", true)
 	cfg.ContainerRegistry.Username = utils.InputPrompt("Enter the container registry username (if required)", "", false)
 	cfg.ContainerRegistry.Token = utils.InputPrompt("Enter the container registry access token or password", "", true)
-	return
 }
 
 func (cfg *Config) setupGitHub() {

internal/config/flags.go

@@ -12,24 +12,24 @@ import "time"
 
 type Flags struct {
 	// persistent flags defined in root command
-	AppPath   string
-	OutFormat string
+	AppPath          string
+	OutFormat        string
+	RegistryAddress  string
+	RegistryToken    string
+	RegistryUsername string
 
 	DryRun  bool
 	Info    bool
 	Verbose bool
 
 	// flags used by subcommands
-	AppDeployment    string
-	Builder          string
-	Kind             string
-	Namespace        string
-	Platform         string
-	Version          string
-	VirtEnv          string
-	RegistryAddress  string
-	RegistryUsername string
-	RegistryToken    string
+	AppDeployment string
+	Builder       string
+	Kind          string
+	Namespace     string
+	Platform      string
+	Version       string
+	VirtEnv       string
 
 	CreateTag  bool
 	ForceBuild bool