From dd6daf5ae7754e1ac59880e07fa8eb5bac9b8bd0 Mon Sep 17 00:00:00 2001
From: Jim Ma <majinjing3@gmail.com>
Date: Wed, 9 Jun 2021 16:59:08 +0800
Subject: [PATCH] fix: Makefile and build.sh (#309)

Signed-off-by: Jim Ma <majinjing3@gmail.com>
---
 Makefile      | 14 ++++++++++++--
 hack/build.sh |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6e4e5e91dde..3ea5db6309c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,11 @@ build-dirs: ## Prepare required folders for build
 	@mkdir -p ./bin
 .PHONY: build-dirs
 
-docker-build: docker-build-cdn docker-build-dfdaemon docker-build-scheduler
+docker-build: docker-build-cdn docker-build-dfdaemon docker-build-scheduler docker-build-manager
 	@echo "Build image done."
 .PHONY: docker-build
 
-docker-push: docker-push-cdn docker-push-dfdaemon docker-push-scheduler
+docker-push: docker-push-cdn docker-push-dfdaemon docker-push-scheduler docker-push-manager
 	@echo "Push image done."
 .PHONY: docker-push
 
@@ -50,6 +50,11 @@ docker-build-scheduler: ## Build scheduler image
 	./hack/docker-build.sh scheduler
 .PHONY: docker-build-scheduler
 
+docker-build-manager: ## Build manager image
+	@echo "Begin to use docker build manager image."
+	./hack/docker-build.sh manager
+.PHONY: docker-build-manager
+
 docker-push-cdn: docker-build-cdn ## Push cdn image
 	@echo "Begin to push cdn docker image."
 	./hack/docker-push.sh cdn
@@ -65,6 +70,11 @@ docker-push-scheduler: docker-build-scheduler ## Push scheduler image
 	./hack/docker-push.sh scheduler
 .PHONY: docker-push-scheduler
 
+docker-push-manager: docker-build-manager ## Push manager image
+	@echo "Begin to push manager docker image."
+	./hack/docker-push.sh manager
+.PHONY: docker-push-manager
+
 build: build-cdn build-scheduler build-dfget build-manager ## Build dragonfly
 .PHONY: build
 
diff --git a/hack/build.sh b/hack/build.sh
index 632cc07a0d0..168a9219d01 100755
--- a/hack/build.sh
+++ b/hack/build.sh
@@ -83,7 +83,7 @@ build-docker() {
 }
 
 build-cdn-docker() {
-    build-docker ${DFDAEMON_BINARY_NAME} dfdaemon
+    build-docker ${CDN_BINARY_NAME} dfdaemon
 }
 
 build-dfget-docker() {
@@ -91,7 +91,7 @@ build-dfget-docker() {
 }
 
 build-scheduler-docker() {
-    build-docker ${scheduler_BINARY_NAME} scheduler
+    build-docker ${SCHEDULER_BINARY_NAME} scheduler
 }
 
 build-manager-docker() {