From 11737623b11a03b360e485337234bf377a7783a9 Mon Sep 17 00:00:00 2001
From: Mike Terzo <mike@terzo.org>
Date: Mon, 16 Oct 2017 07:42:20 -0400
Subject: [PATCH] Docker build needs to use light weight tags to get the proper
 version from GitHub releases.

Only use git describe when docker builds master
use the tag name which is stored in the environment
variable SOURCE_BRANCH.

See:
https://docs.docker.com/docker-cloud/builds/advanced/#override-build-test-or-push-commands
---
 hooks/pre_build | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hooks/pre_build b/hooks/pre_build
index 8c914a4..db14ab3 100755
--- a/hooks/pre_build
+++ b/hooks/pre_build
@@ -1,6 +1,16 @@
 #!/bin/bash
 
-version=$(git describe HEAD --abbrev=4)
+
+
+git_version=$(git describe HEAD --tags --abbrev=4)
+
+
+if [ ${SOURCE_BRANCH} == "master" ]
+then
+    version=$git_version
+else
+    version=$(echo ${SOURCE_BRANCH} | sed 's/v//')
+fi
 
 cat << EOF > puppetboard/version.py
 #