Merge pull request #6714 from dokku/6422-remove-plugin-trigger-setup
Use CallPlugnTrigger instead of PlugnTriggerSetup
This commit is contained in:
1 file changed
+14
-4
@@ -213,8 +213,13 @@ func executeScript(appName string, image string, imageTag string, phase string)
|
|||||||
}
|
}
|
||||||
|
|
||||||
var dockerArgs []string
|
var dockerArgs []string
|
||||||
if b, err := common.PlugnTriggerSetup("docker-args-deploy", []string{appName, imageTag}...).SetInput("").Output(); err == nil {
|
results, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
words, err := shellquote.Split(strings.TrimSpace(string(b[:])))
|
Trigger: "docker-args-deploy",
|
||||||
|
Args: []string{appName, imageTag},
|
||||||
|
Stdin: strings.NewReader(""),
|
||||||
|
})
|
||||||
|
if err == nil {
|
||||||
|
words, err := shellquote.Split(results.StdoutContents())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -222,8 +227,13 @@ func executeScript(appName string, image string, imageTag string, phase string)
|
|||||||
dockerArgs = append(dockerArgs, words...)
|
dockerArgs = append(dockerArgs, words...)
|
||||||
}
|
}
|
||||||
|
|
||||||
if b, err := common.PlugnTriggerSetup("docker-args-process-deploy", []string{appName, imageSourceType, imageTag}...).SetInput("").Output(); err == nil {
|
results, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
words, err := shellquote.Split(strings.TrimSpace(string(b[:])))
|
Trigger: "docker-args-process-deploy",
|
||||||
|
Args: []string{appName, imageSourceType, imageTag},
|
||||||
|
Stdin: strings.NewReader(""),
|
||||||
|
})
|
||||||
|
if err == nil {
|
||||||
|
words, err := shellquote.Split(results.StdoutContents())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user