mirror of
https://github.com/dokku/dokku.git
synced 2026-05-18 05:05:46 +02:00
fix: correct global env path, migration join, and test app dirs
- Use DOKKU_LIB_ROOT instead of DOKKU_ROOT in getGlobalFile() to match the intended new config path layout - Add missing comma in filepath.Join for old app ENV migration path - Revert common_test.go app dirs to DOKKU_ROOT since app detection still uses AppRoot()
This commit is contained in:
@@ -396,5 +396,5 @@ func getAppFile(appName string) (string, error) {
|
||||
}
|
||||
|
||||
func getGlobalFile() string {
|
||||
return filepath.Join(common.MustGetEnv("DOKKU_ROOT"), "config", "--global", "ENV")
|
||||
return filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "config", "--global", "ENV")
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ func TriggerInstall() error {
|
||||
return fmt.Errorf("Unable to setup app environment: %s", err.Error())
|
||||
}
|
||||
|
||||
oldEnvFile := filepath.Join(common.AppRoot(appName) + "ENV")
|
||||
oldEnvFile := filepath.Join(common.AppRoot(appName), "ENV")
|
||||
isMigrated := common.PropertyGetDefault("config", appName, "env-migrated", "")
|
||||
// delete the old file on the next install
|
||||
if isMigrated == "true" {
|
||||
|
||||
Reference in New Issue
Block a user