From 5425abb483662f2a5f4d3409abdd619e9dbad29a Mon Sep 17 00:00:00 2001 From: Lachlan Evenson Date: Tue, 13 Mar 2018 14:40:37 -0700 Subject: [PATCH] Update ordering of Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 45ae359..e89b6a1 100644 --- 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) .