Fix Dockerfile and Makefile

This commit is contained in:
James Mills
2021-01-30 14:07:19 +10:00
parent 4529ea3196
commit 0610914b9d
5 changed files with 358 additions and 18 deletions

View File

@@ -12,24 +12,16 @@ deps:
dev : DEBUG=1
dev : build
@./twt -v
@./twtd -D -O -R
cli:
@go build -tags "netgo static_build" -installsuffix netgo \
-ldflags "-w \
-X $(shell go list).Version=$(VERSION) \
-X $(shell go list).Commit=$(COMMIT)" \
./cmd/twt/...
@./spyda -D
server: generate
@go build -tags "netgo static_build" -installsuffix netgo \
-ldflags "-w \
-X $(shell go list).Version=$(VERSION) \
-X $(shell go list).Commit=$(COMMIT)" \
./cmd/twtd/...
./cmd/spyda/...
build: cli server
build: server
generate:
@if [ x"$(DEBUG)" = x"1" ]; then \
@@ -43,8 +35,7 @@ generate:
fi
install: build
@go install ./cmd/twt/...
@go install ./cmd/twtd/...
@go install ./cmd/spyda/...
ifeq ($(PUBLISH), 1)
image: