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

remove dockerbin target, fix dockerfile and update docker_repo in makefile 

Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
This commit is contained in:
Martin Buchleitner 2019-06-14 07:39:16 +02:00
parent 83f84922a0
commit 4960ab3928
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -12,11 +12,11 @@ COPY . $GOPATH/src/github.com/davidnewhall/unifi-poller
WORKDIR $GOPATH/src/github.com/davidnewhall/unifi-poller WORKDIR $GOPATH/src/github.com/davidnewhall/unifi-poller
RUN dep ensure \ RUN dep ensure \
&& make dockerbin && CGO_ENABLED=0 make build
FROM scratch FROM scratch
COPY --from=builder /go/src/github.com/davidnewhall/unifi-poller/unifi-poller.dockerbin /unifi-poller COPY --from=builder /go/src/github.com/davidnewhall/unifi-poller/unifi-poller /unifi-poller
COPY --from=builder /go/src/github.com/davidnewhall/unifi-poller/examples/up.conf.example /etc/unifi-poller/up.conf COPY --from=builder /go/src/github.com/davidnewhall/unifi-poller/examples/up.conf.example /etc/unifi-poller/up.conf
VOLUME [ "/etc/unifi-poller"] VOLUME [ "/etc/unifi-poller"]

8
Makefile
View File

@ -9,7 +9,7 @@ OSX_PKG_PREFIX=com.github.davidnewhall
GOLANGCI_LINT_ARGS=--enable-all -D gochecknoglobals GOLANGCI_LINT_ARGS=--enable-all -D gochecknoglobals
PACKAGE:=./cmd/$(BINARY) PACKAGE:=./cmd/$(BINARY)
LIBRARY:=./pkg/$(BINARY) LIBRARY:=./pkg/$(BINARY)
DOCKER_REPO="" DOCKER_REPO="golift"
ITERATION:=$(shell git rev-list --count HEAD||echo 0) ITERATION:=$(shell git rev-list --count HEAD||echo 0)
ifeq ($(VERSION),) ifeq ($(VERSION),)
@ -70,12 +70,6 @@ $(BINARY).linux:
# Building linux binary. # Building linux binary.
GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE) GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE)
dockerbin: $(BINARY).dockerbin
$(BINARY).dockerbin:
# Building linux binary.
CGO_ENABLED=0 GOOS=linux go build -o $(BINARY).dockerbin -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE)
macos: $(BINARY).macos macos: $(BINARY).macos
$(BINARY).macos: $(BINARY).macos:
# Building darwin binary. # Building darwin binary.