Update ordering of Makefile

lachie83 · Mar 13, 2018 · 5425abb · 5425abb
1 parent 311737b
commit 5425abb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,16 +1,16 @@
 DOCKER_IMAGE ?= lachlanevenson/internallb-webhook-admission-controller
 GIT_BRANCH ?= `git rev-parse --abbrev-ref HEAD`
 
-ifeq ($(GIT_BRANCH),)
-	DOCKER_TAG = ${CIRCLE_TAG}
-endif
-
 ifeq ($(GIT_BRANCH), master)
 	DOCKER_TAG = latest
 else
 	DOCKER_TAG = $(GIT_BRANCH)
 endif
 
+ifeq ($(GIT_BRANCH),)
+	DOCKER_TAG = ${CIRCLE_TAG}
+endif
+
 docker_build:
 	docker build -t $(DOCKER_IMAGE):$(DOCKER_TAG) .