github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: correct global env path, migration join, and test app dirs

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/common/common_test.go
View File

@@ -10,11 +10,11 @@ import (
var ( var (
testAppName = "test-app-1" testAppName = "test-app-1"
testAppDir = strings.Join([]string{"/var/lib/dokku/config/config/", testAppName}, "") testAppDir = strings.Join([]string{"/home/dokku/", testAppName}, "")
testEnvFile = strings.Join([]string{testAppDir, "/ENV"}, "") testEnvFile = strings.Join([]string{testAppDir, "/ENV"}, "")
testEnvLine = "export testKey=TESTING" testEnvLine = "export testKey=TESTING"
testAppName2 = "01-test-app-1" testAppName2 = "01-test-app-1"
testAppDir2 = strings.Join([]string{"/var/lib/dokku/config/config/", testAppName2}, "") testAppDir2 = strings.Join([]string{"/home/dokku/", testAppName2}, "")
testEnvFile2 = strings.Join([]string{testAppDir2, "/ENV"}, "") testEnvFile2 = strings.Join([]string{testAppDir2, "/ENV"}, "")
testEnvLine2 = "export testKey=TESTING" testEnvLine2 = "export testKey=TESTING"
) )

2
plugins/config/environment.go
View File

@@ -396,5 +396,5 @@ func getAppFile(appName string) (string, error) {
} }
func getGlobalFile() string { func getGlobalFile() string {
return filepath.Join(common.MustGetEnv("DOKKU_ROOT"), "config", "--global", "ENV") return filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "config", "--global", "ENV")
} }

2
plugins/config/triggers.go
View File

@@ -114,7 +114,7 @@ func TriggerInstall() error {
return fmt.Errorf("Unable to setup app environment: %s", err.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", "") isMigrated := common.PropertyGetDefault("config", appName, "env-migrated", "")
// delete the old file on the next install // delete the old file on the next install
if isMigrated == "true" { if isMigrated == "true" {