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

refactor: move pre-deploy call to post-release-builder

Browse Source 
Some of the hooks should happen before we push images out...
This commit is contained in:
Jose Diaz-Gonzalez
2021-08-13 01:42:11 -04:00
parent faf53aa479
commit 257abfaee8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/common/functions
View File

@@ -657,7 +657,6 @@ cmd-deploy() {
verify_app_name "$APP"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
plugn trigger scheduler-deploy "$DOKKU_SCHEDULER" "$APP" "$IMAGE_TAG"
}

10
plugins/registry/triggers.go
View File

@@ -61,6 +61,12 @@ func TriggerPostReleaseBuilder(appName string, image string) error {
computedImageRepo := reportComputedImageRepo(appName)
newImage := strings.Replace(image, imageRepo+":", computedImageRepo+":", 1)
parts := strings.Split(newImage, ":")
imageTag := parts[len(parts)-1]
if err := common.PlugnTrigger("pre-deploy", []string{appName, imageTag}...); err != nil {
return err
}
if computedImageRepo != imageRepo {
if !dockerTag(imageID, newImage) {
// TODO: better error
@@ -73,10 +79,10 @@ func TriggerPostReleaseBuilder(appName string, image string) error {
}
common.LogInfo1("Pushing image to registry")
imageTag, err := incrementTagVersion(appName)
newTag, err := incrementTagVersion(appName)
if err != nil {
return err
}
return pushToRegistry(appName, imageTag, imageID, computedImageRepo)
return pushToRegistry(appName, newTag, imageID, computedImageRepo)
}