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

refactor: directly trigger pre-deploy hook from post-release-builder script

Browse Source 
This removes the extra indirection in the deploy process for triggering the hooks.
This commit is contained in:
Jose Diaz-Gonzalez
2024-04-04 02:27:43 -04:00
parent 08a136f73f
commit ad5537c086
7 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ps/Makefile
View File

@@ -1,5 +1,5 @@
SUBCOMMANDS = subcommands/inspect subcommands/rebuild subcommands/report subcommands/restart subcommands/restore subcommands/retire subcommands/scale subcommands/set subcommands/start subcommands/stop
TRIGGERS = triggers/app-restart triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-stop triggers/pre-deploy triggers/procfile-get-command triggers/procfile-exists triggers/ps-can-scale triggers/ps-current-scale triggers/ps-set-scale triggers/report
TRIGGERS = triggers/app-restart triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-release-builder triggers/post-stop triggers/procfile-get-command triggers/procfile-exists triggers/ps-can-scale triggers/ps-current-scale triggers/ps-set-scale triggers/report
BUILD = commands subcommands triggers
PLUGIN_NAME = ps

9
plugins/ps/src/triggers/triggers.go
View File

@@ -55,10 +55,11 @@ func main() {
case "post-stop":
appName := flag.Arg(0)
err = ps.TriggerPostStop(appName)
case "pre-deploy":
appName := flag.Arg(0)
imageTag := flag.Arg(1)
err = ps.TriggerPreDeploy(appName, imageTag)
case "post-release-builder":
builderType := flag.Arg(0)
appName := flag.Arg(1)
image := flag.Arg(2)
err = ps.TriggerPostReleaseBuilder(builderType, appName, image)
case "procfile-get-command":
appName := flag.Arg(0)
processType := flag.Arg(1)

4
plugins/ps/triggers.go
View File

@@ -257,8 +257,8 @@ func TriggerPostStop(appName string) error {
})
}
// TriggerPreDeploy ensures an app has an up to date scale parameters
func TriggerPreDeploy(appName string, imageTag string) error {
// TriggerPostReleaseBuilder ensures an app has an up to date scale parameters
func TriggerPostReleaseBuilder(builderType string, appName string, image string) error {
if err := updateScale(appName, false, FormationSlice{}); err != nil {
common.LogDebug(fmt.Sprintf("Error generating scale file: %s", err.Error()))
return err