Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2026-02-24 04:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore DOKKU_SCALE file if app.json has formations key

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-08-01 00:30:31 -04:00
parent 3fe10efd09
commit bc49a2e124
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/app-json/functions.go
View File

@@ -535,14 +535,17 @@ func injectDokkuScale(appName string, image string) error {
return nil
}
common.LogWarn("Deprecated: Use the 'formation' key in app.json to specify scaling instead of DOKKU_SCALE")
lines, err := common.FileToSlice(dokkuScaleFile)
if err != nil {
return err
}
if appJSON.Formation == nil {
common.LogWarn("Deprecated: Use the 'formation' key in app.json to specify scaling instead of DOKKU_SCALE")
appJSON.Formation = make(map[string]Formation)
} else {
common.LogWarn("Deprecated: DOKKU_SCALE ignored in favor of 'formation' key in app.json")
return nil
}
for _, line := range lines {