diff --git a/Makefile b/Makefile index 4ff3075f..8e5a3259 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,13 @@ DOCKERFILE = Dockerfile GIT_COMMIT = $(shell git rev-parse HEAD) GOLANGCI_CONTAINER=golangci/golangci-lint:v1.29-alpine +DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") export DOCKER_BUILDKIT = 1 .PHONY: nginx-prometheus-exporter nginx-prometheus-exporter: - GO111MODULE=on CGO_ENABLED=0 go build -mod=vendor -ldflags "-X main.version=$(VERSION) -X main.commit=$(GIT_COMMIT)" -o nginx-prometheus-exporter + 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 .PHONY: lint lint: @@ -28,7 +29,7 @@ test: .PHONY: container container: - docker build --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --target container -f $(DOCKERFILEPATH)/$(DOCKERFILE) -t $(PREFIX):$(TAG) . + docker build --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE) --target container -f $(DOCKERFILEPATH)/$(DOCKERFILE) -t $(PREFIX):$(TAG) . .PHONY: push push: container diff --git a/build/Dockerfile b/build/Dockerfile index 64b9e210..d2e30222 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,6 +1,7 @@ FROM golang:1.16 as base ARG VERSION ARG GIT_COMMIT +ARG DATE ARG TARGETARCH WORKDIR /go/src/github.com/nginxinc/nginx-prometheus-exporter @@ -11,7 +12,7 @@ COPY collector ./collector COPY client ./client FROM base as builder -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 . +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 . FROM scratch as intermediate