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

WIP: default to compose.yml instead of all of 'em

Browse Source
This commit is contained in:
3wc
2021-10-12 10:25:37 +02:00
parent 84489495dc
commit a0b4886eba
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/config/app.go
View File

@ -334,17 +334,15 @@ func GetAppStatuses(appFiles AppFiles) (map[string]map[string]string, error) {
// GetAppComposeFiles gets the list of compose files for an app which should be // GetAppComposeFiles gets the list of compose files for an app which should be
// 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) {
var composeFiles []string
if _, ok := appEnv["COMPOSE_FILE"]; !ok { if _, ok := appEnv["COMPOSE_FILE"]; !ok {
logrus.Debug("no COMPOSE_FILE detected, loading all compose files") logrus.Debug("no COMPOSE_FILE detected, loading compose.yml")
pattern := fmt.Sprintf("%s/%s/compose**yml", APPS_DIR, recipe) path := fmt.Sprintf("%s/%s/compose.yml", APPS_DIR, recipe)
composeFiles, err := filepath.Glob(pattern) composeFiles = append (composeFiles, path)
if err != nil {
return composeFiles, err
}
return composeFiles, nil return composeFiles, nil
} }
var composeFiles []string
composeFileEnvVar := appEnv["COMPOSE_FILE"] composeFileEnvVar := appEnv["COMPOSE_FILE"]
envVars := strings.Split(composeFileEnvVar, ":") envVars := strings.Split(composeFileEnvVar, ":")
logrus.Debugf("COMPOSE_FILE detected ('%s'), loading '%s'", composeFileEnvVar, strings.Join(envVars, ", ")) logrus.Debugf("COMPOSE_FILE detected ('%s'), loading '%s'", composeFileEnvVar, strings.Join(envVars, ", "))