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

WIP heinous appEnv threading for env var loading

Browse Source
This commit is contained in:
decentral1se
2021-09-01 15:01:20 +02:00
parent 09873b42ce
commit 063fa66af9
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cli/recipe/recipe.go
View File

@ -172,7 +172,17 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
internal.ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
}
compose, err := config.GetAppComposeFiles(recipe)
appFiles, err := config.LoadAppFiles("")
if err != nil {
logrus.Fatal(err)
}
appEnv, err := config.GetApp(appFiles, recipe)
if err != nil {
logrus.Fatal(err)
}
compose, err := config.GetAppComposeFiles(recipe, appEnv.Env)
if err != nil {
logrus.Fatal(err)
}
@ -263,7 +273,7 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
logrus.Fatal(err)
}
if err := config.UpdateAppComposeTag(recipe, image, upgradeTag); err != nil {
if err := config.UpdateAppComposeTag(recipe, image, upgradeTag, appEnv.Env); err != nil {
logrus.Fatal(err)
}
}
@ -292,7 +302,17 @@ the versioning metadata of up-and-running containers are.
internal.ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
}
compose, err := config.GetAppComposeFiles(recipe)
appFiles, err := config.LoadAppFiles("")
if err != nil {
logrus.Fatal(err)
}
appEnv, err := config.GetApp(appFiles, recipe)
if err != nil {
logrus.Fatal(err)
}
compose, err := config.GetAppComposeFiles(recipe, appEnv.Env)
if err != nil {
logrus.Fatal(err)
}
@ -321,7 +341,7 @@ the versioning metadata of up-and-running containers are.
tag := img.(reference.NamedTagged).Tag()
label := fmt.Sprintf("coop-cloud.${STACK_NAME}.%s.version=%s-%s", service.Name, tag, digest)
if err := config.UpdateAppComposeLabel(recipe, service.Name, label); err != nil {
if err := config.UpdateAppComposeLabel(recipe, service.Name, label, appEnv.Env); err != nil {
logrus.Fatal(err)
}
}
@ -340,7 +360,17 @@ var recipeLintCommand = &cli.Command{
internal.ShowSubcommandHelpAndError(c, errors.New("no recipe provided"))
}
compose, err := config.GetAppComposeFiles(recipe)
appFiles, err := config.LoadAppFiles("")
if err != nil {
logrus.Fatal(err)
}
appEnv, err := config.GetApp(appFiles, recipe)
if err != nil {
logrus.Fatal(err)
}
compose, err := config.GetAppComposeFiles(recipe, appEnv.Env)
if err != nil {
logrus.Fatal(err)
}