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

refactor: execute the predeploy script during the pre-release-builder plugin trigger

Browse Source 
This fixes an issue where the post-release-builder trigger inadvertently modifies the image. We take advantage of the fact that env vars are available at the `pre-release-builder` phase to ensure any image modifications occur as appropriate.
This commit is contained in:
Jose Diaz-Gonzalez
2024-04-04 02:34:09 -04:00
parent 2937ffb880
commit 104a5b4a93
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/app-json/Makefile
View File

@@ -1,5 +1,5 @@
SUBCOMMANDS = subcommands/report subcommands/set
TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/app-json-get-content triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-deploy triggers/post-release-builder triggers/report
TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/app-json-get-content triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-deploy triggers/post-release-builder triggers/pre-release-builder triggers/report
BUILD = commands subcommands triggers
PLUGIN_NAME = app-json

5
plugins/app-json/src/triggers/triggers.go
View File

@@ -61,6 +61,11 @@ func main() {
appName := flag.Arg(1)
image := flag.Arg(2)
err = appjson.TriggerPostReleaseBuilder(builderType, appName, image)
case "pre-release-builder":
builderType := flag.Arg(0)
appName := flag.Arg(1)
image := flag.Arg(2)
err = appjson.TriggerPreReleaseBuilder(builderType, appName, image)
case "report":
appName := flag.Arg(0)
err = appjson.ReportSingleApp(appName, "", "")

10
plugins/app-json/triggers.go
View File

@@ -212,14 +212,16 @@ func TriggerPostDeploy(appName string, imageTag string) error {
return executeScript(appName, image, imageTag, "postdeploy")
}
func TriggerPreReleaseBuilder(builderType string, appName string, image string) error {
parts := strings.Split(image, ":")
imageTag := parts[len(parts)-1]
return executeScript(appName, image, imageTag, "predeploy")
}
// TriggerPostReleaseBuilder is a trigger to execute predeploy and release deployment tasks
func TriggerPostReleaseBuilder(builderType string, appName string, image string) error {
parts := strings.Split(image, ":")
imageTag := parts[len(parts)-1]
if err := executeScript(appName, image, imageTag, "predeploy"); err != nil {
return err
}
if err := executeScript(appName, image, imageTag, "release"); err != nil {
return err
}