From abc0375f6a48cc5c4ab6f569848e989a1eab62d0 Mon Sep 17 00:00:00 2001 From: Umputun Date: Tue, 19 Jun 2018 13:17:13 -0500 Subject: [PATCH] rollback lightweight git-rev detection --- .dockerignore | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 31445978..74c2545d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,7 @@ /web/public/ /.vscode/ /.idea/ -/.git/objects/ +#/.git/objects/ # source files docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 1a665eba..fb2ef73a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN if [ -z "$COVERALLS_TOKEN" ] ; then \ else goveralls -coverprofile=.cover/cover.out -service=travis-ci -repotoken $COVERALLS_TOKEN; fi RUN \ - version=$(/script/git-rev.sh) && \ + version=$(git rev-parse --abbrev-ref HEAD)-$(git describe --abbrev=7 --always --tags)-$(date +%Y%m%d-%H:%M:%S) && \ echo "version $version" && \ go build -o remark -ldflags "-X main.revision=${version} -s -w" ./app