github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: correctly split flags

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2025-09-12 19:19:13 -04:00
parent a1b6d05568
commit bcfff18db9
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/docker-options/dockeroptions.go
View File

@@ -105,18 +105,18 @@ func GetSpecifiedDockerOptionsForPhase(appName string, phase string, desiredOpti
break break
} }
parts := strings.SplitN(option, " ", 2)
if len(parts) != 2 {
common.LogWarn(fmt.Sprintf("Invalid docker option found for %s: %s", appName, option))
continue
}
// match options that are in the format "--option=value" // match options that are in the format "--option=value"
if strings.HasPrefix(option, fmt.Sprintf("%s=", desiredOption)) { if strings.HasPrefix(option, fmt.Sprintf("%s=", desiredOption)) {
if _, ok := foundOptions[desiredOption]; !ok { if _, ok := foundOptions[desiredOption]; !ok {
foundOptions[desiredOption] = []string{} foundOptions[desiredOption] = []string{}
} }
parts := strings.SplitN(option, "=", 2)
if len(parts) != 2 {
common.LogWarn(fmt.Sprintf("Invalid docker option found for %s: %s", appName, option))
continue
}
foundOptions[desiredOption] = append(foundOptions[desiredOption], parts[1]) foundOptions[desiredOption] = append(foundOptions[desiredOption], parts[1])
break break
} }
@@ -127,6 +127,12 @@ func GetSpecifiedDockerOptionsForPhase(appName string, phase string, desiredOpti
foundOptions[desiredOption] = []string{} foundOptions[desiredOption] = []string{}
} }
parts := strings.SplitN(option, " ", 2)
if len(parts) != 2 {
common.LogWarn(fmt.Sprintf("Invalid docker option found for %s: %s", appName, option))
continue
}
foundOptions[desiredOption] = append(foundOptions[desiredOption], parts[1]) foundOptions[desiredOption] = append(foundOptions[desiredOption], parts[1])
break break
} }