Skip to content
Permalink
Browse files
fix(deploy): WERF_SET_DOCKER_CONFIG_VALUE not working
1. Rename WERF_SET_DOCKER_CONFIG_VALUE to WERF_SET_DOCKER_CONFIG_JSON_VALUE to match cli option `--set-docker-config-json-value`.
2. Fixed bug: WERF_SET_DOCKER_CONFIG_JSON_VALUE does not affect converge process.

Refs werf/actions#40
  • Loading branch information
distorhead committed Oct 14, 2021
1 parent 354a76b commit b850301d16a2dd9c05c223eebe745de95cdf9db8
Showing with 2 additions and 2 deletions.
  1. +2 −2 cmd/werf/common/common.go
@@ -143,7 +143,7 @@ func GetLongCommandDescription(text string) string {

func SetupSetDockerConfigJsonValue(cmdData *CmdData, cmd *cobra.Command) {
cmdData.SetDockerConfigJsonValue = new(bool)
cmd.Flags().BoolVarP(cmdData.SetDockerConfigJsonValue, "set-docker-config-json-value", "", GetBoolEnvironmentDefaultFalse(os.Getenv("WERF_SET_DOCKER_CONFIG_VALUE")), "Shortcut to set current docker config into the .Values.dockerconfigjson")
cmd.Flags().BoolVarP(cmdData.SetDockerConfigJsonValue, "set-docker-config-json-value", "", GetBoolEnvironmentDefaultFalse("WERF_SET_DOCKER_CONFIG_JSON_VALUE"), "Shortcut to set current docker config into the .Values.dockerconfigjson")
}

func SetupGitWorkTree(cmdData *CmdData, cmd *cobra.Command) {
@@ -1267,7 +1267,7 @@ func getAddCustomTag(cmdData *CmdData) []string {
}

func GetSet(cmdData *CmdData) []string {
return append(PredefinedValuesByEnvNamePrefix("WERF_SET_", "WERF_SET_STRING_", "WERF_SET_FILE_", "WERF_SET_DOCKER_CONFIG_VALUE"), *cmdData.Set...)
return append(PredefinedValuesByEnvNamePrefix("WERF_SET_", "WERF_SET_STRING_", "WERF_SET_FILE_", "WERF_SET_DOCKER_CONFIG_JSON_VALUE"), *cmdData.Set...)
}

func GetSetString(cmdData *CmdData) []string {

0 comments on commit b850301

Please sign in to comment.