Katenary/katenary
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Fix compose file argument

Browse Source 
fix #7
This commit is contained in:
Patrice Ferlet
2022-04-01 07:59:53 +02:00
parent 6a2417c361
commit 1dd8fef4b3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/main.go
View File

@@ -5,6 +5,7 @@ import (
"katenary/generator/writers" "katenary/generator/writers"
"katenary/helm" "katenary/helm"
"katenary/update" "katenary/update"
"log"
"strconv" "strconv"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@@ -70,6 +71,7 @@ func main() {
if err != nil { if err != nil {
writers.IndentSize = indentation writers.IndentSize = indentation
} }
log.Println("ComposeFile:", composeFile)
Convert(composeFile, appversion, appName, chartDir, force) Convert(composeFile, appversion, appName, chartDir, force)
}, },
} }

9
cmd/utils.go
View File

@@ -93,9 +93,12 @@ func detectGitVersion() (string, error) {
} }
func Convert(composeFile, appVersion, appName, chartDir string, force bool) { func Convert(composeFile, appVersion, appName, chartDir string, force bool) {
composeFound := FindComposeFile() if len(composeFile) == 0 {
fmt.Println("No compose file given")
return
}
_, err := os.Stat(ComposeFile) _, err := os.Stat(ComposeFile)
if !composeFound && err != nil { if err != nil {
fmt.Println("No compose file found") fmt.Println("No compose file found")
os.Exit(1) os.Exit(1)
} }
@@ -131,7 +134,7 @@ func Convert(composeFile, appVersion, appName, chartDir string, force bool) {
} }
// Parse the compose file now // Parse the compose file now
p := compose.NewParser(ComposeFile) p := compose.NewParser(composeFile)
p.Parse(appName) p.Parse(appName)
// start generator // start generator