Fix version flag
This commit is contained in:
5
Makefile
5
Makefile
@@ -38,8 +38,8 @@ else
|
||||
@echo "=> Build in container using" $(CTN)
|
||||
@echo
|
||||
endif
|
||||
ifeq ($(GO),local)
|
||||
echo $(BLD_CMD)
|
||||
ifeq ($(GO),local)
|
||||
$(BLD_CMD)
|
||||
else ifeq ($(CTN),podman)
|
||||
@podman run --rm -v $(PWD):/go/src/katenary:z -w /go/src/katenary --userns keep-id -it golang $(BLD_CMD)
|
||||
@@ -48,7 +48,8 @@ else
|
||||
endif
|
||||
echo
|
||||
echo "Check the version"
|
||||
echo "'./katenary version' => $(shell ./katenary version)"
|
||||
echo -n "'./katenary version' => "; ./katenary version
|
||||
echo
|
||||
|
||||
|
||||
install: build
|
||||
|
15
cmd/main.go
15
cmd/main.go
@@ -11,13 +11,14 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
var composeFiles = []string{"docker-compose.yaml", "docker-compose.yml"}
|
||||
var ComposeFile = ""
|
||||
var AppName = "MyApp"
|
||||
var Version = "master" // set at build time to the git version/tag
|
||||
var ChartsDir = "chart"
|
||||
|
||||
var AppVersion = "0.0.1"
|
||||
var (
|
||||
composeFiles = []string{"docker-compose.yaml", "docker-compose.yml"}
|
||||
ComposeFile = ""
|
||||
AppName = "MyApp"
|
||||
ChartsDir = "chart"
|
||||
Version = "master"
|
||||
AppVersion = "0.0.1"
|
||||
)
|
||||
|
||||
func init() {
|
||||
FindComposeFile()
|
||||
|
7
main.go
7
main.go
@@ -7,7 +7,8 @@ import (
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var Version = "master" // set at build time to the git version/tag
|
||||
var Version = "master" // changed at compile time
|
||||
|
||||
var longHelp = `Katenary aims to be a tool to convert docker-compose files to Helm Charts.
|
||||
It will create deployments, services, volumes, secrets, and ingress resources.
|
||||
But it will also create initContainers based on depend_on, healthcheck, and other features.
|
||||
@@ -25,6 +26,10 @@ or
|
||||
`
|
||||
|
||||
func main() {
|
||||
|
||||
// set the version to "cmd" package - yes... it's ugly
|
||||
cmd.Version = Version
|
||||
|
||||
// The base command
|
||||
rootCmd := &cobra.Command{
|
||||
Use: "katenary",
|
||||
|
Reference in New Issue
Block a user