From bc49a2e124a86cb75da32a967ed9ee76ffc4a0ef Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 1 Aug 2021 00:30:31 -0400 Subject: [PATCH] fix: ignore DOKKU_SCALE file if app.json has formations key --- plugins/app-json/functions.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/app-json/functions.go b/plugins/app-json/functions.go index 20d7586e6..6958046a9 100644 --- a/plugins/app-json/functions.go +++ b/plugins/app-json/functions.go @@ -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 {