Skip to content

Commit daf6e29

Browse files
Garrison Davisfhaynes
Garrison Davis
authored andcommitted
Make SOURCE_DATE_EPOCH changes for idk
(cherry picked from commit be619fa)
1 parent d0ea451 commit daf6e29

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ COPY . ./
3030
COPY --from=lattice-builder /lattice/build /lattice
3131
RUN /go/bin/statik -src=/lattice -dest=/pilosa
3232

33-
ENV SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH
33+
ENV SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
3434
RUN make build FLAGS="-o build/featurebase" ${MAKE_FLAGS}
3535

3636
#####################

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ GOOS=$(shell $(GO) env GOOS)
77
GOARCH=$(shell $(GO) env GOARCH)
88
VERSION_ID=$(if $(TRIAL_DEADLINE),trial-$(TRIAL_DEADLINE)-,)$(VERSION)-$(GOOS)-$(GOARCH)
99
DATE_FMT="+%FT%T%z"
10+
# set SOURCE_DATE_EPOCH like this to use the last git commit timestamp
11+
# export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) instead of the current time from running `date`
1012
ifdef SOURCE_DATE_EPOCH
1113
BUILD_TIME ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)")
1214
else

idk/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ COPY . .
2323

2424
ARG MAKE_FLAGS
2525
ARG GO_BUILD_FLAGS
26+
ARG SOURCE_DATE_EPOCH
2627

2728
WORKDIR /featurebase/idk/
2829

30+
ENV SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
2931
RUN make build GO_BUILD_FLAGS="-mod=vendor ${GO_BUILD_FLAGS}" ${MAKE_FLAGS}
3032

3133
FROM ubuntu:20.04 as runner

idk/Makefile

+9-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ ODBC_ENABLED=
88
BINOUT ?= bin
99
VERSION := $(shell git describe --tags 2> /dev/null || git rev-parse --verify --short=7 HEAD)
1010
VERSION_ID = $(VERSION)-$(GOOS)-$(GOARCH)
11-
BUILD_TIME := $(shell date -u +%FT%T%z)
11+
DATE_FMT="+%FT%T%z"
12+
# set SOURCE_DATE_EPOCH like this to use the last git commit timestamp
13+
# export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) instead of the current time from running `date`.
14+
ifdef SOURCE_DATE_EPOCH
15+
BUILD_TIME ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)")
16+
else
17+
BUILD_TIME ?= $(shell date -u "$(DATE_FMT)")
18+
endif
1219
AWS_ACCOUNTID ?= undefined
1320
BRANCH_NAME ?= ""
1421

@@ -271,6 +278,7 @@ docker-build: vendor
271278
--build-arg GO_VERSION=$(GO_VERSION) \
272279
--build-arg MAKE_FLAGS="GOOS=$(GOOS) GOARCH=$(GOARCH) BUILD_CGO=$(BUILD_CGO)" \
273280
--build-arg GO_BUILD_FLAGS=$(GO_BUILD_FLAGS) \
281+
--build-arg SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
274282
--target builder \
275283
--tag idk:$(BUILD_NAME) ../.
276284
mkdir -p build/idk-$(GOOS)-$(GOARCH)

0 commit comments

Comments
 (0)