From d243f7d62a30960d65b461a6e6ef25fefde38187 Mon Sep 17 00:00:00 2001
From: bzub <bzubrod@gmail.com>
Date: Sun, 9 Jul 2017 20:00:10 -0500
Subject: [PATCH] Fix image tag for branch commits

---
 .travis.yml | 3 ++-
 Makefile    | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b41192f4..7a0b8907 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,8 @@ go:
 branches:
   only: 
     - master
-    - v0.*
+    - /^bzub-.*$/
+    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
 
 env:
   global:
diff --git a/Makefile b/Makefile
index 62913797..7b5e825f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ DEV_SUFFIX?=-git
 LOCAL_PACKAGES?=app app/controllers app/options app/watchers
 IMG_NAMESPACE?=cloudnativelabs
 GIT_COMMIT=$(shell git describe --tags --dirty)
-IMG_TAG?=$(if $(IMG_TAG_PREFIX),$(IMG_TAG_PREFIX)-)
-# GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
+GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
+IMG_TAG?=$(if $(IMG_TAG_PREFIX),$(IMG_TAG_PREFIX)-)$(GIT_BRANCH)-latest
 RELEASE_TAG?=$(shell build/get-git-tag.sh)
 REGISTRY?=$(if $(IMG_FQDN),$(IMG_FQDN)/$(IMG_NAMESPACE)/$(NAME),$(IMG_NAMESPACE)/$(NAME))
 REGISTRY_DEV?=$(REGISTRY)$(DEV_SUFFIX)
@@ -29,6 +29,9 @@ run: kube-router ## Runs "kube-router --help".
 container: kube-router ## Builds a Docker container image.
 	@echo Starting kube-router container image build.
 	$(DOCKER) build -t "$(REGISTRY_DEV):$(IMG_TAG)" .
+	@if [ "$(GIT_BRANCH)" = "master" ]; then \
+	    $(DOCKER) tag "$(REGISTRY_DEV):$(IMG_TAG)" "$(REGISTRY_DEV):latest"; \
+	fi
 	@echo Finished kube-router container image build.
 
 docker-login: ## Logs into a docker registry using {DOCKER,QUAY}_{USERNAME,PASSWORD} variables.