mirror of
https://github.com/dokku/dokku.git
synced 2026-08-29 10:08:53 +02:00
fix: skip app.json buildpacks for image-based deploys
When deploying via git:from-image, the source image may contain an app.json with buildpacks entries that are not relevant. Check for the source-image property and skip app.json buildpacks when set.
This commit is contained in:
@@ -28,6 +28,14 @@ func getBuildpacks(appName string) ([]string, error) {
|
||||
return buildpacks, nil
|
||||
}
|
||||
|
||||
results, _ := common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||
Trigger: "git-get-property",
|
||||
Args: []string{appName, "source-image"},
|
||||
})
|
||||
if results.StdoutContents() != "" {
|
||||
return buildpacks, nil
|
||||
}
|
||||
|
||||
appJSON, err := appjson.GetAppJSON(appName)
|
||||
if err != nil {
|
||||
return buildpacks, err
|
||||
|
||||
Reference in New Issue
Block a user