Skip to content

Commit e5b4568

Browse files
committed
added GIT_COMMIT_DATE to migrator so that version contains something more human-readable than commit sha
1 parent 348e323 commit e5b4568

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ RUN go get -d -v github.com/lukaszbudnik/migrator
1010
RUN cd /go/src/github.com/lukaszbudnik/migrator && git checkout $SOURCE_BRANCH && ./setup.sh
1111
RUN cd /go/src/github.com/lukaszbudnik/migrator && \
1212
GIT_BRANCH=$(git branch | awk -v FS=' ' '/\*/{print $NF}' | sed 's|[()]||g') && \
13+
GIT_COMMIT_DATE=$(git log -n1 --date=iso-strict | grep 'Date:' | sed 's|Date:\s*||g') && \
1314
GIT_COMMIT_SHA=$(git rev-list -1 HEAD) && \
14-
go build -ldflags "-X main.GitCommitSha=$GIT_COMMIT_SHA -X main.GitBranch=$GIT_BRANCH"
15+
go build -ldflags "-X main.GitCommitDate=$GIT_COMMIT_DATE -X main.GitCommitSha=$GIT_COMMIT_SHA -X main.GitBranch=$GIT_BRANCH"
1516

1617
FROM alpine:3.8
1718
COPY --from=builder /go/src/github.com/lukaszbudnik/migrator/migrator /bin

TestDockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,20 @@ ARG SOURCE_BRANCH=master
1010
RUN apk add git
1111

1212
# A - install migrator from local source code
13-
#RUN mkdir -p /go/src/github.com/lukaszbudnik/migrator
14-
#COPY . /go/src/github.com/lukaszbudnik/migrator
13+
RUN mkdir -p /go/src/github.com/lukaszbudnik/migrator
14+
COPY . /go/src/github.com/lukaszbudnik/migrator
1515

1616
# B - install migrator from $SOURCE_BRANCH branch
17-
RUN go get -d -v github.com/lukaszbudnik/migrator
18-
RUN cd /go/src/github.com/lukaszbudnik/migrator && git checkout $SOURCE_BRANCH && ./setup.sh
17+
#RUN go get -d -v github.com/lukaszbudnik/migrator
18+
#RUN cd /go/src/github.com/lukaszbudnik/migrator && git checkout $SOURCE_BRANCH
19+
20+
RUN cd /go/src/github.com/lukaszbudnik/migrator && ./setup.sh
1921

2022
RUN cd /go/src/github.com/lukaszbudnik/migrator && \
2123
GIT_BRANCH=$(git branch | awk -v FS=' ' '/\*/{print $NF}' | sed 's|[()]||g') && \
24+
GIT_COMMIT_DATE=$(git log -n1 --date=iso-strict | grep 'Date:' | sed 's|Date:\s*||g') && \
2225
GIT_COMMIT_SHA=$(git rev-list -1 HEAD) && \
23-
go build -ldflags "-X main.GitCommitSha=$GIT_COMMIT_SHA -X main.GitBranch=$GIT_BRANCH"
26+
go build -ldflags "-X main.GitCommitDate=$GIT_COMMIT_DATE -X main.GitCommitSha=$GIT_COMMIT_SHA -X main.GitBranch=$GIT_BRANCH"
2427

2528
FROM alpine:3.8
2629
COPY --from=builder /go/src/github.com/lukaszbudnik/migrator/migrator /bin

migrator.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ var GitBranch string
2121
// GitCommitSha stores git commit sha, value injected during production build
2222
var GitCommitSha string
2323

24+
// GitCommitDate stores git commit date time, value injected during production build
25+
var GitCommitDate string
26+
2427
func main() {
2528

2629
log.SetFlags(log.Ldate | log.Ltime | log.Lmicroseconds | log.LUTC)
2730

28-
log.Printf("INFO migrator version %v (%v)", GitBranch, GitCommitSha)
31+
log.Printf("INFO migrator version %v, build %v, date %v", GitBranch, GitCommitSha, GitCommitDate)
2932

3033
flag := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
3134
buf := new(bytes.Buffer)

0 commit comments

Comments
 (0)