Logenhancement

.gitignore

@@ -0,0 +1 @@
+_output/

.travis.yml

@@ -1,7 +1,5 @@
 language: go
 go:
-  - "1.11.x"
+  - "1.15.x"
 
 before_install:
-  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-  - dep ensure

Makefile

@@ -2,11 +2,26 @@
 BIN ?= docker-socket-firewall
 PKG := github.com/linead/docker-socket-firewall
 
+TAG_COMMIT := $(shell git rev-list --abbrev-commit --tags --max-count=1)
+TAG := $(shell git describe --abbrev=0 --tags ${TAG_COMMIT} 2>/dev/null || true)
+COMMIT := $(shell git rev-parse --short HEAD)
+DATE := $(shell git log -1 --format=%cd --date=format:"%Y%m%d")
+VERSION := $(TAG:v%=%)
+ifneq ($(COMMIT), $(TAG_COMMIT))
+	VERSION := $(VERSION)-next-$(COMMIT)-$(DATE)
+endif
+ifeq ($(VERSION,), "" )
+	VERSION := $(COMMIT)-$(DATA)
+endif
+ifneq ($(shell git status --porcelain),)
+	VERSION := $(VERSION)-dirty
+endif
+
+LDFLAGS := -ldflags "-X main.gitInfo=$(VERSION)"
+
 local : ARCH ?= $(shell go env GOOS)-$(shell go env GOARCH)
 ARCH ?= linux-amd64
 
-SRC_DIRS := cmd pkg # directories which hold app source (not vendored)
-
 CLI_PLATFORMS := linux-amd64 darwin-amd64 
 
 platform_temp = $(subst -, ,$(ARCH))
@@ -17,29 +32,20 @@ VERSION ?= master
 local: build-dirs
 	GOOS=$(GOOS) \
 	GOARCH=$(GOARCH) \
-	VERSION=$(VERSION) \
-	PKG=$(PKG) \
-	BIN=$(BIN) \
-	OUTPUT_DIR=$$(pwd)/_output/bin/$(GOOS)/$(GOARCH) \
-	./hack/build.sh
+	go build $(LDFLAGS)
+	mv $(BIN) _output/bin/$(GOOS)/$(GOARCH)/
 
 mac:
 	GOOS=darwin \
 	GOARCH=amd64 \
-	VERSION=$(VERSION) \
-	PKG=$(PKG) \
-	BIN=$(BIN) \
-	OUTPUT_DIR=$$(pwd)/_output/bin/linux/amd64 \
-	./hack/build.sh
+	go build $(LDFLAGS)
+	mv $(BIN) _output/bin/darwin/amd64/
 
 linux:
 	GOOS=linux \
 	GOARCH=amd64 \
-	VERSION=$(VERSION) \
-	PKG=$(PKG) \
-	BIN=$(BIN) \
-	OUTPUT_DIR=$$(pwd)/_output/bin/linux/amd64 \
-	./hack/build.sh
+	go build $(LDFLAGS)
+	mv $(BIN) _output/bin/linux/amd64/
 
 tests:
 	go test -covermode=count ./...