mirror of
https://github.com/whyvl/wireproxy.git
synced 2025-04-29 10:51:42 +02:00
Fix tag describe in makefile (#65)
* Fix tag describe in makefile * Use build directive from makefile
This commit is contained in:
parent
d898e7a931
commit
6fcd53d2a0
2 changed files with 5 additions and 3 deletions
|
@ -4,7 +4,7 @@ FROM golang:1.18 as build
|
|||
WORKDIR /usr/src/wireproxy
|
||||
COPY . .
|
||||
|
||||
RUN CGO_ENABLED=0 go build ./cmd/wireproxy
|
||||
RUN make
|
||||
|
||||
# Now copy it into our base image.
|
||||
FROM gcr.io/distroless/static-debian11:nonroot
|
||||
|
|
6
Makefile
6
Makefile
|
@ -1,12 +1,14 @@
|
|||
export GO ?= go
|
||||
export CGO_ENABLED = 0
|
||||
|
||||
TAG := $(shell git describe --always --tags $(git rev-list --tags --max-count=1) --match v*)
|
||||
|
||||
.PHONY: all
|
||||
all: wireproxy
|
||||
|
||||
.PHONY: wireproxy
|
||||
wireproxy:
|
||||
tag="$$(git describe --tag 2>/dev/null)" && \
|
||||
${GO} build -ldflags "-X 'main.version=$$tag'" ./cmd/wireproxy
|
||||
${GO} build -trimpath -ldflags "-s -w -X 'main.version=${TAG}'" ./cmd/wireproxy
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue