Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly handle return from PluginTriggerOutput

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-08-30 14:51:25 -04:00
parent beb42b53b2
commit 8126c63d6e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/app-json/appjson.go
View File

@@ -107,7 +107,7 @@ func getReleaseCommand(appName string, image string) string {
processType := "release"
port := "5000"
b, _ := common.PlugnTriggerOutput("procfile-get-command", []string{appName, processType, port}...)
return string(b[:])
return strings.TrimSpace(string(b[:]))
}
func executeScript(appName string, imageTag string, phase string) error {
@@ -143,11 +143,11 @@ func executeScript(appName string, imageTag string, phase string) error {
var dockerArgs []string
if b, err := common.PlugnTriggerSetup("docker-args-deploy", []string{appName, imageTag}...).SetInput("").Output(); err != nil {
dockerArgs = append(dockerArgs, strings.Split(string(b[:]), "\n")...)
dockerArgs = append(dockerArgs, strings.Split(strings.TrimSpace(string(b[:])), "\n")...)
}
if b, err := common.PlugnTriggerSetup("docker-args-process-deploy", []string{appName, imageSourceType, imageTag}...).SetInput("").Output(); err != nil {
dockerArgs = append(dockerArgs, strings.Split(string(b[:]), "\n")...)
dockerArgs = append(dockerArgs, strings.Split(strings.TrimSpace(string(b[:])), "\n")...)
}
filteredArgs := []string{"restart", "cpus", "memory", "memory-swap", "memory-reservation", "gpus"}
@@ -171,12 +171,12 @@ func executeScript(appName string, imageTag string, phase string) error {
}
dokkuAppShell := "/bin/bash"
if b, _ := common.PlugnTriggerOutput("config-get-global", []string{"DOKKU_APP_SHELL"}...); string(b[:]) != "" {
dokkuAppShell = string(b[:])
if b, _ := common.PlugnTriggerOutput("config-get-global", []string{"DOKKU_APP_SHELL"}...); strings.TrimSpace(string(b[:])) != "" {
dokkuAppShell = strings.TrimSpace(string(b[:]))
}
if b, _ := common.PlugnTriggerOutput("config-get", []string{appName, "DOKKU_APP_SHELL"}...); string(b[:]) != "" {
dokkuAppShell = string(b[:])
if b, _ := common.PlugnTriggerOutput("config-get", []string{appName, "DOKKU_APP_SHELL"}...); strings.TrimSpace(string(b[:])) != "" {
dokkuAppShell = strings.TrimSpace(string(b[:]))
}
containerCommand := []string{dokkuAppShell, "-c", script}
@@ -277,8 +277,9 @@ func waitForExecution(containerID string) bool {
return false
}
containerExitCode := string(b[:])
return containerExitCode != "0"
containerExitCode := strings.TrimSpace(string(b[:]))
common.LogDebug(fmt.Sprintf("Container Exit code: '%v'", containerExitCode))
return containerExitCode == "0"
}
func createdContainerID(appName string, dockerArgs []string, image string, command []string, phase string) (string, error) {