diff --git a/.gitignore b/.gitignore index 3330b02..7492d9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ debug.log -historyposter +historyposterd diff --git a/Dockerfile b/Dockerfile index 775f2e7..a4e62c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ RUN tar -c /go | bzip2 > /go.tbz2 FROM scratch AS final COPY --from=builder /user/group /user/passwd /etc/ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/git.eeqj.de/sneak/historyposter/historyposter /app/historyposter +COPY --from=builder /go/src/git.eeqj.de/sneak/historyposter/historyposterd /app/historyposterd COPY --from=builder /go.tbz2 /go.tbz2 WORKDIR /app @@ -45,4 +45,4 @@ EXPOSE 8080 USER nobody:nobody -ENTRYPOINT ["./historyposter"] +ENTRYPOINT ["./historyposterd"] diff --git a/Makefile b/Makefile index 8ef7be2..5d7b6ec 100644 --- a/Makefile +++ b/Makefile @@ -37,18 +37,18 @@ lint: sh -c 'test -z "$$(gofmt -l .)"' debug: build - GOTRACEBACK=all HISTORYPOSTER_DEBUG=1 ./$(FN) 2>&1 | tee -a debug.log + GOTRACEBACK=all HISTORYPOSTER_DEBUG=1 ./$(FN)d 2>&1 | tee -a debug.log debugger: cd cmd/historyposter && dlv debug main.go run: build - ./$(FN) + ./$(FN)d clean: - -rm ./$(FN) + -rm ./$(FN)d -build: ./$(FN) +build: ./$(FN)d docker: docker build . @@ -56,7 +56,7 @@ docker: go-get: cd cmd/$(FN) && go get -v -./$(FN): */*.go cmd/*/*.go go-get - cd cmd/$(FN) && go build -o ../../$(FN) $(GOFLAGS) . +./$(FN)d: */*.go cmd/*/*.go go-get + cd cmd/$(FN) && go build -o ../../$(FN)d $(GOFLAGS) . .PHONY: build fmt test is_uncommitted docker dist hub upload-docker-image clean run rundebug default build-docker-image-dist