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
8
8
GIT_COMMIT = $(shell git rev-parse HEAD)
9
9
10
10
GOLANGCI_CONTAINER =golangci/golangci-lint:v1.29-alpine
11
+ DATE = $(shell date -u +"% Y-% m-% dT% H:% M:% SZ")
11
12
12
13
export DOCKER_BUILDKIT = 1
13
14
14
15
.PHONY : nginx-prometheus-exporter
15
16
nginx-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
17
18
18
19
.PHONY : lint
19
20
lint :
28
29
29
30
.PHONY : container
30
31
container :
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 ) .
32
33
33
34
.PHONY : push
34
35
push : container
Original file line number Diff line number Diff line change 1
1
FROM golang:1.16 as base
2
2
ARG VERSION
3
3
ARG GIT_COMMIT
4
+ ARG DATE
4
5
ARG TARGETARCH
5
6
6
7
WORKDIR /go/src/github.com/nginxinc/nginx-prometheus-exporter
@@ -11,7 +12,7 @@ COPY collector ./collector
11
12
COPY client ./client
12
13
13
14
FROM 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 .
15
16
16
17
17
18
FROM scratch as intermediate
You can’t perform that action at this time.
0 commit comments