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

new package envfile and move GetComposeFiles to recipe package

Browse Source
This commit is contained in:
p4u1
2024-07-06 16:13:17 +02:00
parent 37aff723c0
commit 0076b31253
15 changed files with 128 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/compose/compose.go
View File

@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"
"coopcloud.tech/abra/pkg/app"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/envfile"
"coopcloud.tech/abra/pkg/formatter"
"coopcloud.tech/abra/pkg/upstream/stack"
loader "coopcloud.tech/abra/pkg/upstream/stack"
@ -30,7 +30,7 @@ func UpdateTag(pattern, image, tag, recipeName string) (bool, error) {
opts := stack.Deploy{Composefiles: []string{composeFile}}
envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
sampleEnv, err := app.ReadEnv(envSamplePath)
sampleEnv, err := envfile.ReadEnv(envSamplePath)
if err != nil {
return false, err
}
@ -98,7 +98,7 @@ func UpdateLabel(pattern, serviceName, label, recipeName string) error {
opts := stack.Deploy{Composefiles: []string{composeFile}}
envSamplePath := path.Join(config.RECIPES_DIR, recipeName, ".env.sample")
sampleEnv, err := app.ReadEnv(envSamplePath)
sampleEnv, err := envfile.ReadEnv(envSamplePath)
if err != nil {
return err
}