public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix dock and version

This commit is contained in:
davidnewhall2 2019-12-26 20:38:55 -08:00
parent ad91081e86
commit 3cf7d89363
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -46,10 +46,10 @@ endef
PLUGINS:=$(patsubst plugins/%/main.go,%,$(wildcard plugins/*/main.go)) PLUGINS:=$(patsubst plugins/%/main.go,%,$(wildcard plugins/*/main.go))
VERSION_LDFLAGS:= \ VERSION_LDFLAGS:= \
-X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Branch=$(TRAVIS_BRANCH) \ -X github.com/prometheus/common/version.Branch=$(TRAVIS_BRANCH) \
-X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.BuildDate=$(DATE) \ -X github.com/prometheus/common/version.BuildDate=$(DATE) \
-X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Revision=$(COMMIT) \ -X github.com/prometheus/common/version.Revision=$(COMMIT) \
-X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Version=$(VERSION)-$(ITERATION) -X github.com/prometheus/common/version.Version=$(VERSION)-$(ITERATION)
# Makefile targets follow. # Makefile targets follow.

2
init/docker/Dockerfile
View File

@ -25,7 +25,7 @@ RUN apt-get update \
COPY . $GOPATH/src/${IMPORT_PATH} COPY . $GOPATH/src/${IMPORT_PATH}
WORKDIR $GOPATH/src/${IMPORT_PATH} WORKDIR $GOPATH/src/${IMPORT_PATH}
RUN dep ensure --vendor-only \ RUN go mod vendor \
&& CGO_ENABLED=0 make ${BINARY}.${ARCH}.${OS} && CGO_ENABLED=0 make ${BINARY}.${ARCH}.${OS}
FROM scratch FROM scratch