Skip to content

Commit b850301

Browse files
committed
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
1 parent 354a76b commit b850301

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmd/werf/common/common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func GetLongCommandDescription(text string) string {
143143

144144
func SetupSetDockerConfigJsonValue(cmdData *CmdData, cmd *cobra.Command) {
145145
cmdData.SetDockerConfigJsonValue = new(bool)
146-
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")
146+
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")
147147
}
148148

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

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

12731273
func GetSetString(cmdData *CmdData) []string {

0 commit comments

Comments
 (0)