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:
Jose Diaz-Gonzalez
2026-04-25 02:39:02 -04:00
parent bc4d3a76b9
commit d846324fd5
3 changed files with 4 additions and 4 deletions

View File

@@ -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")
}

View File

@@ -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" {