From 1241b21691eb27d3a2cf05bc081fa8c06e133af3 Mon Sep 17 00:00:00 2001 From: Evan Chen Date: Sat, 16 Oct 2021 02:09:42 +0800 Subject: [PATCH] update --- CHANGELOG.md | 6 ++++++ Makefile | 11 +++++++---- main.go | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..436c891 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# 0.1.2 + +## Fix + +* refactor: use cobra and pflag +* client mode unreachable in docker \ No newline at end of file diff --git a/Makefile b/Makefile index a730bcb..551871a 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,13 @@ build: build-bins: $(foreach GOOS, $(PLATFORMS), $(foreach GOARCH, $(ARCHITECTURES), \ - $(shell export GOOS=$(GOOS); export GOARCH=$(GOARCH); go build ${LDFLAGS} -o dist/$(PROJ)_$(VERSION)_$(GOOS)_$(GOARCH)))) + $(shell export GOOS=$(GOOS); export GOARCH=$(GOARCH); go build ${LDFLAGS} -o dist/$(PROJ)_$(VERSION)_$(GOOS)_$(GOARCH)/$(PROJ)))) build-m1: - $(shell export GOOS=darwin; export GOARCH=arm64; go build ${LDFLAGS} -o dist/$(PROJ)_$(VERSION)_darwin_arm64) + $(shell export GOOS=darwin; export GOARCH=arm64; go build ${LDFLAGS} -o dist/$(PROJ)_$(VERSION)_darwin_arm64/$(PROJ)) + +build-zip: + cd dist; for f in * ;do tar -czf $${f}.tar.gz $${f}; done docker: docker build --target builder -t $(HUB)/$(HUB_PROJECT)/$(PROJ):builder . @@ -39,9 +42,9 @@ docker-push: docker push $(HUB)/$(HUB_PROJECT)/$(PROJ):latest docker-save: - docker save -o dist/$(PROJ)-$(VERSION)-${BUILD}.tar $(HUB)/$(HUB_PROJECT)/$(PROJ):$(VERSION) + docker save $(HUB)/$(HUB_PROJECT)/$(PROJ):$(VERSION) | gzip > dist/$(PROJ)-image-$(VERSION)-${BUILD}.tar.gz -release: build-bins build-m1 docker docker-save docker-push +release: clean build-bins build-m1 build-zip docker docker-save docker-push .PHONY: build docker release clean all \ No newline at end of file diff --git a/main.go b/main.go index f440e7d..b4fc63b 100644 --- a/main.go +++ b/main.go @@ -17,14 +17,14 @@ var versionCmd = &cobra.Command{ Short: "version", Long: `Print the version number of myip`, Run: func(cmd *cobra.Command, args []string) { - fmt.Println(Version + Build) + fmt.Println(Version + "-" + Build) }, } func init() { log.SetFlags(0) log.SetOutput(os.Stdout) - cmd.ClientCmd.Version = Version + cmd.ClientCmd.Version = Version + "-" + Build cmd.ClientCmd.AddCommand(versionCmd) cmd.ClientCmd.AddCommand(cmd.ServerCmd) }