diff --git a/Makefile b/Makefile index 62ffc52..8273586 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ LD_FLAGS='-X "$(SERVICE)/version.TAG=$(TAG)" -X "$(SERVICE)/version.VERSION=$(VE default: build build: - go build -ldflags $(LD_FLAGS) -gcflags "-N" -i -o $(SERVER_DEMO_BIN) $(SERVER_DEMO_PATH)/main.go - go build -ldflags $(LD_FLAGS) -gcflags "-N" -i -o $(CLIENT_DEMO_BIN) $(CLIENT_DEMO_PATH)/main.go + go build -ldflags $(LD_FLAGS) -gcflags "-N" -o $(SERVER_DEMO_BIN) $(SERVER_DEMO_PATH)/main.go + go build -ldflags $(LD_FLAGS) -gcflags "-N" -o $(CLIENT_DEMO_BIN) $(CLIENT_DEMO_PATH)/main.go clean: rm $(SERVER_DEMO_BIN) rm $(CLIENT_DEMO_BIN) diff --git a/examples/zinx_client/Makefile b/examples/zinx_client/Makefile new file mode 100644 index 0000000..e6e9630 --- /dev/null +++ b/examples/zinx_client/Makefile @@ -0,0 +1,21 @@ +PROJECT_NAME:=zinx_client +VERSION:=v1 + + +.PHONY: image run build clean + +build: + bash build.sh ${PROJECT_NAME} + +image: + docker build -t ${PROJECT_NAME}:${VERSION} . + +run: + docker run -itd \ + -p 8999:8999 \ + ${PROJECT_NAME}:${VERSION} + + +clean: + rm -rf ${PROJECT_NAME} + diff --git a/examples/zinx_client/build.sh b/examples/zinx_client/build.sh new file mode 100644 index 0000000..cfb700a --- /dev/null +++ b/examples/zinx_client/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +APP_NAME=$1 +APP_VERSION=v$(cat version) +BUILD_VERSION=$(git log -1 --oneline) +BUILD_TIME=$(date "+%FT%T%z") +GIT_REVISION=$(git rev-parse --short HEAD) +GIT_BRANCH=$(git name-rev --name-only HEAD) +GO_VERSION=$(go version) + + +go build -ldflags " \ + -X 'main.AppName=${APP_NAME}' \ + -X 'main.AppVersion=${APP_VERSION}' \ + -X 'main.BuildVersion=${BUILD_VERSION//\'/_}' \ + -X 'main.BuildTime=${BUILD_TIME}' \ + -X 'main.GitRevision=${GIT_REVISION}' \ + -X 'main.GitBranch=${GIT_BRANCH}' \ + -X 'main.GoVersion=${GO_VERSION}' \ + " -o $APP_NAME diff --git a/examples/zinx_client/version b/examples/zinx_client/version new file mode 100644 index 0000000..276027b --- /dev/null +++ b/examples/zinx_client/version @@ -0,0 +1 @@ +v 1.0.0 diff --git a/examples/zinx_client/zinx_client b/examples/zinx_client/zinx_client new file mode 100755 index 0000000..72679db Binary files /dev/null and b/examples/zinx_client/zinx_client differ diff --git a/examples/zinx_server/build.sh b/examples/zinx_server/build.sh index a294827..cfb700a 100644 --- a/examples/zinx_server/build.sh +++ b/examples/zinx_server/build.sh @@ -10,6 +10,7 @@ GIT_REVISION=$(git rev-parse --short HEAD) GIT_BRANCH=$(git name-rev --name-only HEAD) GO_VERSION=$(go version) + go build -ldflags " \ -X 'main.AppName=${APP_NAME}' \ -X 'main.AppVersion=${APP_VERSION}' \ @@ -18,4 +19,4 @@ go build -ldflags " \ -X 'main.GitRevision=${GIT_REVISION}' \ -X 'main.GitBranch=${GIT_BRANCH}' \ -X 'main.GoVersion=${GO_VERSION}' \ - " -o $2 . + " -o $APP_NAME diff --git a/go.mod b/go.mod index 0afff76..d27693c 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,7 @@ module github.com/aceld/zinx go 1.13 -require github.com/golang/protobuf v1.3.3 +require ( + github.com/golang/protobuf v1.3.3 + golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d // indirect +) diff --git a/go.sum b/go.sum deleted file mode 100644 index b1efb8b..0000000 --- a/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=