File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -8,12 +8,13 @@ DOCKERFILE = Dockerfile
88GIT_COMMIT = $(shell git rev-parse HEAD)
99
1010GOLANGCI_CONTAINER =golangci/golangci-lint:v1.29-alpine
11+ DATE = $(shell date -u +"% Y-% m-% dT% H:% M:% SZ")
1112
1213export DOCKER_BUILDKIT = 1
1314
1415.PHONY : nginx-prometheus-exporter
1516nginx-prometheus-exporter :
16- GO111MODULE=on CGO_ENABLED=0 go build -mod=vendor -ldflags " -X main.version=$( VERSION) -X main.commit=$( GIT_COMMIT) " -o nginx-prometheus-exporter
17+ GO111MODULE=on CGO_ENABLED=0 go build -mod=vendor -ldflags " -X main.version=$( VERSION) -X main.commit=$( GIT_COMMIT) -X main.date= $( DATE ) " -o nginx-prometheus-exporter
1718
1819.PHONY : lint
1920lint :
2829
2930.PHONY : container
3031container :
31- docker build --build-arg VERSION=$(VERSION ) --build-arg GIT_COMMIT=$(GIT_COMMIT ) --target container -f $(DOCKERFILEPATH ) /$(DOCKERFILE ) -t $(PREFIX ) :$(TAG ) .
32+ docker build --build-arg VERSION=$(VERSION ) --build-arg GIT_COMMIT=$(GIT_COMMIT ) --build-arg DATE= $( DATE ) -- target container -f $(DOCKERFILEPATH ) /$(DOCKERFILE ) -t $(PREFIX ) :$(TAG ) .
3233
3334.PHONY : push
3435push : container
Original file line number Diff line number Diff line change 11FROM golang:1.16 as base
22ARG VERSION
33ARG GIT_COMMIT
4+ ARG DATE
45ARG TARGETARCH
56
67WORKDIR /go/src/github.com/nginxinc/nginx-prometheus-exporter
@@ -11,7 +12,7 @@ COPY collector ./collector
1112COPY client ./client
1213
1314FROM base as builder
14- RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -mod=vendor -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT}" -o nginx-prometheus-exporter .
15+ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -mod=vendor -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE} " -o nginx-prometheus-exporter .
1516
1617
1718FROM scratch as intermediate
You can’t perform that action at this time.
0 commit comments