Skip to content

Commit

Permalink
fix: Makefile and build.sh (#309)
Browse files Browse the repository at this point in the history
Signed-off-by: Jim Ma <majinjing3@gmail.com>
  • Loading branch information
jim3ma authored Jun 9, 2021
1 parent 2610e2e commit dd6daf5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
14 changes: 12 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ build-docker() {
}

build-cdn-docker() {
build-docker ${DFDAEMON_BINARY_NAME} dfdaemon
build-docker ${CDN_BINARY_NAME} dfdaemon
}

build-dfget-docker() {
build-docker ${DFGET_BINARY_NAME} dfget
}

build-scheduler-docker() {
build-docker ${scheduler_BINARY_NAME} scheduler
build-docker ${SCHEDULER_BINARY_NAME} scheduler
}

build-manager-docker() {
Expand Down

0 comments on commit dd6daf5

Please sign in to comment.