You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by bz...@apache.org on 2021/09/23 11:45:23 UTC
[apisix-docker] branch master updated: chore: add more makefile
output prompts (#224)
This is an automated email from the ASF dual-hosted git repository.
bzp2010 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 96766a0 chore: add more makefile output prompts (#224)
96766a0 is described below
commit 96766a0f06ae6cde10481eb8267881c9e856e8b4
Author: leslie <59...@users.noreply.github.com>
AuthorDate: Thu Sep 23 19:44:41 2021 +0800
chore: add more makefile output prompts (#224)
* chore: now Makefile target `help` can handle comment of type "help:xxx"
Signed-off-by: Leslie <le...@icloud.com>
* chore: add more output prompts
Signed-off-by: Leslie <le...@icloud.com>
* chore: update prompts style
Signed-off-by: leslie tsang <le...@icloud.com>
---
Makefile | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 208a6fd..3f91f33 100644
--- a/Makefile
+++ b/Makefile
@@ -63,13 +63,17 @@ endef
### build-on-centos : Build apache/apisix:xx-centos image
.PHONY: build-on-centos
build-on-centos:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-centos -f ./centos/Dockerfile .
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### build-on-alpine : Build apache/apisix:xx-alpine image
.PHONY: build-on-alpine
build-on-alpine:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine -f ./alpine/Dockerfile .
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### build-on-alpine-local : Build apache/apisix:xx-alpine-local image
@@ -77,72 +81,92 @@ build-on-alpine:
# Use this name (in the same patterns with others) for convenient CI
.PHONY: build-on-alpine-local
build-on-alpine-local:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine-local --build-arg APISIX_PATH=${APISIX_PATH} -f ./alpine-local/Dockerfile .
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### push-on-centos : Push apache/apisix:xx-centos image
# centos not support multiarch since it reply on x86 rpm package
.PHONY: push-on-centos
push-on-centos:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) push $(ENV_APISIX_IMAGE_TAG_NAME)-centos
$(ENV_DOCKER) build -t $(IMAGE_NAME):latest -f ./centos/Dockerfile .
$(ENV_DOCKER) push $(IMAGE_NAME):latest
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### push-on-alpine : Push apache/apisix:xx-alpine image
.PHONY: push-multiarch-on-alpine
push-multiarch-on-alpine:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --push \
-t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine \
--platform linux/amd64,linux/arm64 \
-f ./alpine/Dockerfile .
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### build-on-alpine-cn : Build apache/apisix:xx-alpine image (for chinese)
.PHONY: build-on-alpine-cn
build-on-alpine-cn:
- $(ENV_DOCKER) build -t $(IMAGE_NAME):${APISIX_VERSION}-alpine --build-arg APISIX_VERSION=${APISIX_VERSION} --build-arg ENABLE_PROXY=true -f alpine/Dockerfile alpine
+ @$(call func_echo_status, "$@ -> [ Start ]")
+ $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine --build-arg APISIX_VERSION=$(APISIX_VERSION) --build-arg ENABLE_PROXY=true -f alpine/Dockerfile alpine
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### build-all-in-one : Build All in one Docker container for Apache APISIX
.PHONY: build-all-in-one
build-all-in-one:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(IMAGE_NAME):whole -f ./all-in-one/apisix/Dockerfile .
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### save-centos-tar : tar apache/apisix:xx-centos image
.PHONY: save-centos-tar
save-centos-tar:
+ @$(call func_echo_status, "$@ -> [ Start ]")
mkdir -p package
$(ENV_DOCKER) save -o ./package/$(ENV_APISIX_TAR_NAME)-centos.tar $(ENV_APISIX_IMAGE_TAG_NAME)-centos
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### save-alpine-tar : tar apache/apisix:xx-alpine image
.PHONY: save-alpine-tar
save-alpine-tar:
+ @$(call func_echo_status, "$@ -> [ Start ]")
mkdir -p package
$(ENV_DOCKER) save -o ./package/$(ENV_APISIX_TAR_NAME)-alpine.tar $(ENV_APISIX_IMAGE_TAG_NAME)-alpine
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### build-dashboard : Build apache/dashboard:tag image
.PHONY: build-dashboard
build-dashboard:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION) -f ./dashboard/Dockerfile .
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### push-dashboard : Push apache/dashboard:tag image
.PHONY: push-dashboard
push-dashboard:
+ @$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) push $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION)
$(ENV_DOCKER) build -t $(APISIX_DASHBOARD_IMAGE_NAME):latest -f ./dashboard/Dockerfile .
$(ENV_DOCKER) push $(APISIX_DASHBOARD_IMAGE_NAME):latest
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
-### save-dashboard-tar : tar apache/apisix-dashboard: tag image
+### save-dashboard-tar : tar apache/apisix-dashboard:tag image
.PHONY: save-dashboard-tar
save-dashboard-tar:
+ @$(call func_echo_status, "$@ -> [ Start ]")
mkdir -p package
$(ENV_DOCKER) save -o ./package/$(APISIX_DASHBOARD_IMAGE_TAR_NAME)_$(APISIX_DASHBOARD_VERSION).tar $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION)
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
### help : Show Makefile rules
@@ -151,7 +175,7 @@ help:
@$(call func_echo_success_status, "Makefile rules:")
@echo
@if [ '$(ENV_OS_NAME)' = 'darwin' ]; then \
- awk '{ if(match($$0, /^#{3}([^:]+):(.*)$$/)){ split($$0, res, ":"); _desc=$$0; gsub(/^#{3}([^:]+):[ \t]*/, "", _desc); printf(" make %-25s : %-10s\n", $$2, _desc) } }' Makefile; \
+ awk '{ if(match($$0, /^#{3}([^:]+):(.*)$$/)){ split($$0, res, ":"); gsub(/^#{3}[ ]*/, "", res[1]); _desc=$$0; gsub(/^#{3}([^:]+):[ \t]*/, "", _desc); printf(" make %-25s : %-10s\n", res[1], _desc) } }' Makefile; \
else \
awk '{ if(match($$0, /^\s*#{3}\s*([^:]+)\s*:\s*(.*)$$/, res)){ printf(" make %-25s : %-10s\n", res[1], res[2]) } }' Makefile; \
fi