diff --git a/Dockerfile b/Dockerfile index 9648aba..a9d18ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apk add --no-cache g++ make COPY . /build/ COPY --from=build-node /build/public/dist/ /build/public/dist/ WORKDIR /build -RUN make fetch-go compile +RUN make build # runtime image FROM alpine:latest diff --git a/Makefile b/Makefile index 90dedc8..788e3ab 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,6 @@ .DEFAULT_GOAL := build - -DIRS=bin BINARY=geoip -VERSION=$(shell git describe --tags --always --abbrev=0 --match=v* 2> /dev/null | sed -r "s:^v::g" || echo 0) - -$(info $(shell mkdir -p $(DIRS))) -BIN=$(CURDIR)/bin -export GOBIN=$(CURDIR)/bin - - help: @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[36m%-16s\033[0m %s\n", $$1, $$2}'