Merge pull request #44 from darklynx/dirty_mark_in_version

add dirty mark to a version if service is build from dirty working tr…
darklynx · Jan 17, 2019 · 18698ef · 18698ef
2 parents 8c71104 + b59eea8
commit 18698ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docker/multistage/Dockerfile b/docker/multistage/Dockerfile
@@ -5,7 +5,7 @@
 FROM golang:latest as builder
 WORKDIR /go/src/rbaskets
 COPY . .
-RUN GIT_VERSION="$(git describe || git symbolic-ref -q --short HEAD)" \
+RUN GIT_VERSION="$(git describe --dirty='*' || git symbolic-ref -q --short HEAD)" \
   && GIT_COMMIT="$(git rev-parse HEAD)" \
   && GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)" \
   && set -x \

diff --git a/scripts/build/build.sh b/scripts/build/build.sh
@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
 cd ../..
 
 # collect git version information
-GIT_VERSION="$(git describe)"
+GIT_VERSION="$(git describe --dirty='*')"
 GIT_COMMIT="$(git rev-parse HEAD)"
 GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)"
 

diff --git a/scripts/build/build_linux.sh b/scripts/build/build_linux.sh
@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
 cd ../..
 
 # collect git version information
-GIT_VERSION="$(git describe)"
+GIT_VERSION="$(git describe --dirty='*')"
 GIT_COMMIT="$(git rev-parse HEAD)"
 GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)"