fixes #6 Remove 'heads/origin' prefix from docker tags

harbur · Jun 12, 2015 · a71c655 · a71c655
1 parent 7b3bd1c
commit a71c655
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/captain/git.go b/captain/git.go
@@ -2,6 +2,7 @@ package captain // import "github.com/harbur/captain/captain"
 
 import (
     "strings"
+    "regexp"
 )
 
 func getRevision() string {
@@ -10,7 +11,14 @@ func getRevision() string {
 
 func getBranch() string {
 	branch := oneliner("git", "rev-parse", "--abbrev-ref", "HEAD")
+
+	// Remove start of "heads/origin" if exist
+	r := regexp.MustCompile("^heads\\/origin\\/")
+	branch = r.ReplaceAllString(branch, "")
+
+	// Replace all "/" with "."
 	branch = strings.Replace(branch, "/", ".", -1)
+
 	return branch
 }