codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: log which compose files are being loaded

Browse Source 
See coop-cloud/organising#167.
This commit is contained in:
decentral1se 2021-09-16 09:45:02 +02:00
parent f87aad4688
commit 20ecdb8061
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/config/app.go
View File

@ -304,6 +304,7 @@ func GetAppStatuses(appFiles AppFiles) (map[string]string, error) {
// merged into a composetypes.Config while respecting the COMPOSE_FILE env var. // merged into a composetypes.Config while respecting the COMPOSE_FILE env var.
func GetAppComposeFiles(recipe string, appEnv AppEnv) ([]string, error) { func GetAppComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
if _, ok := appEnv["COMPOSE_FILE"]; !ok { if _, ok := appEnv["COMPOSE_FILE"]; !ok {
logrus.Debug("no COMPOSE_FILE detected, loading all compose files")
pattern := fmt.Sprintf("%s/%s/compose**yml", APPS_DIR, recipe) pattern := fmt.Sprintf("%s/%s/compose**yml", APPS_DIR, recipe)
composeFiles, err := filepath.Glob(pattern) composeFiles, err := filepath.Glob(pattern)
if err != nil { if err != nil {
@ -314,6 +315,8 @@ func GetAppComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
var composeFiles []string var composeFiles []string
composeFileEnvVar := appEnv["COMPOSE_FILE"] composeFileEnvVar := appEnv["COMPOSE_FILE"]
envVars := strings.Split(composeFileEnvVar, ":")
logrus.Debug("COMPOSE_FILE detected ('%s'), loading '%s'", composeFileEnvVar, envVars)
for _, file := range strings.Split(composeFileEnvVar, ":") { for _, file := range strings.Split(composeFileEnvVar, ":") {
path := fmt.Sprintf("%s/%s/%s", APPS_DIR, recipe, file) path := fmt.Sprintf("%s/%s/%s", APPS_DIR, recipe, file)
composeFiles = append(composeFiles, path) composeFiles = append(composeFiles, path)