diff --git a/.docker/build b/.docker/build index ebfbe93f..2856e9ba 100755 --- a/.docker/build +++ b/.docker/build @@ -1,7 +1,7 @@ #!/bin/bash cd ../server -go get && make build +go get && ./build cd ../client npm install && npm run build diff --git a/server/Makefile b/server/build old mode 100644 new mode 100755 similarity index 50% rename from server/Makefile rename to server/build index 7153bea9..a3835e7b --- a/server/Makefile +++ b/server/build @@ -1,9 +1,8 @@ +#!/bin/bash + BUILD_TIME=`date -u +'%Y-%m-%dT%H:%M:%SZ'` GIT_COMMIT=`git rev-parse --short HEAD` GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"` -LDFLAGS=-ldflags "-s -X version.buildTime=${BUILD_TIME} -X version.gitRevision=${GIT_DIRTY}${GIT_REVISION} -X version.gitBranch=${GIT_BRANCH}" - -build: - go build -o bin/neko ${LDFLAGS} -i cmd/neko/main.go +go build -o bin/neko -ldflags "-s -X version.buildTime=${BUILD_TIME} -X version.gitRevision=${GIT_DIRTY}${GIT_REVISION} -X version.gitBranch=${GIT_BRANCH}" -i cmd/neko/main.go \ No newline at end of file