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

Fix version usage

Browse Source
This commit is contained in:
Patrice Ferlet
2021-12-01 09:27:12 +01:00
parent cd74ab0c57
commit c9fae9e508
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,4 +1,4 @@
VERSION=0.1.1 VERSION=0.1.1-alpha
CTN:=$(shell which podman 2>&1 1>/dev/null && echo "podman" || echo "docker") CTN:=$(shell which podman 2>&1 1>/dev/null && echo "podman" || echo "docker")
PREFIX=~/.local/ PREFIX=~/.local/
@@ -25,9 +25,9 @@ build: katenary
katenary: *.go generator/*.go compose/*.go helm/*.go katenary: *.go generator/*.go compose/*.go helm/*.go
@echo Build using $(CTN) @echo Build using $(CTN)
ifeq ($(CTN),podman) ifeq ($(CTN),podman)
@podman run --rm -v $(PWD):/go/src/katenary -w /go/src/katenary --userns keep-id -it golang go build -o katenary -ldflags="-X 'main.AppVersion=$(VERSION)'" . @podman run --rm -v $(PWD):/go/src/katenary -w /go/src/katenary --userns keep-id -it golang go build -o katenary -ldflags="-X 'main.Version=$(VERSION)'" .
else else
@docker run --rm -v $(PWD):/go/src/katenary:z -w /go/src/katenary --user $(shell id -u):$(shell id -g) -e HOME=/tmp -it golang go build -o katenary -ldflags="-X 'main.AppVersion=$(VERSION)'" . @docker run --rm -v $(PWD):/go/src/katenary:z -w /go/src/katenary --user $(shell id -u):$(shell id -g) -e HOME=/tmp -it golang go build -o katenary -ldflags="-X 'main.Version=$(VERSION)'" .
endif endif

6
main.go
View File

@@ -17,7 +17,8 @@ import (
var ComposeFile = "docker-compose.yaml" var ComposeFile = "docker-compose.yaml"
var AppName = "MyApp" var AppName = "MyApp"
var AppVersion = "master" var AppVersion = "0.0.1"
var Version = "master"
func main() { func main() {
@@ -28,10 +29,11 @@ func main() {
flag.Parse() flag.Parse()
if *version { if *version {
fmt.Println(AppVersion) fmt.Println(Version)
os.Exit(0) os.Exit(0)
} }
helm.Version = Version
p := compose.NewParser(ComposeFile) p := compose.NewParser(ComposeFile)
p.Parse(AppName) p.Parse(AppName)
wait := sync.WaitGroup{} wait := sync.WaitGroup{}