From 371929499ab5b1332bdd44738377b6fc8a0c7afe Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan@vmware.com>
Date: Wed, 8 Mar 2017 00:12:13 -0800
Subject: [PATCH] to support nortary

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 19de0b46e..72043a3eb 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,7 @@ compile:check_environment $(COMPILETAG)
 
 prepare: 
 	@echo "preparing..."
-	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+	@if [ "$(NORTARYFLAG)" = "true" ] ; then \
 		$(MAKEPATH)/$(PREPARECMD) --conf $(CONFIGPATH)/$(CONFIGFILE) --with-notary; \
 	else \
 		$(MAKEPATH)/$(PREPARECMD) --conf $(CONFIGPATH)/$(CONFIGFILE) ; \
@@ -286,7 +286,7 @@ package_offline: compile build modify_composefile
 	@echo "pulling nginx and registry..."
 	@$(DOCKERPULL) registry:2.5.1
 	@$(DOCKERPULL) nginx:1.11.5
-	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+	@if [ "$(NORTARYFLAG)" = "true" ] ; then \
 		echo "pulling notary and mariadb..."; \
 		$(DOCKERPULL) jiangd/notary:server-0.5.0-fix; \
 		$(DOCKERPULL) notary:signer-0.5.0; \
@@ -294,7 +294,7 @@ package_offline: compile build modify_composefile
 	fi	
 	
 	@echo "saving harbor docker image"
-	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+	@if [ "$(NORTARYFLAG)" = "true" ] ; then \
 		$(DOCKERSAVE) -o $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \
 		$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_UI):$(VERSIONTAG) \
@@ -345,7 +345,7 @@ pushimage:
 		
 start:
 	@echo "loading harbor images..."
-	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+	@if [ "$(NORTARYFLAG)" = "true" ] ; then \
 		$(DOCKERCOMPOSECMD) -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) up -d ; \
 	else \
 		$(DOCKERCOMPOSECMD) -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) up -d ; \
@@ -354,7 +354,7 @@ start:
 	
 down:
 	@echo "stoping harbor instance..."
-	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
+	@if [ "$(NORTARYFLAG)" = "true" ] ; then \
 		$(DOCKERCOMPOSECMD) -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) down ; \
 	else \
 		$(DOCKERCOMPOSECMD) -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) down ; \