You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2021/09/22 23:31:15 UTC
[GitHub] [apisix-docker] leslie-tsang opened a new pull request #224: chore: add more makefile output prompts
leslie-tsang opened a new pull request #224:
URL: https://github.com/apache/apisix-docker/pull/224
1. add more makefile target output prompts
2. fix target `help` prompts to sync with linux runtime
> before
```bash
docker build output ...
```
> after
```bash
[ info ] build-on-centos -> [ Start ]
docker build output ...
[ info ] build-on-centos -> [ Done ]
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] tokers commented on a change in pull request #224: chore: add more makefile output prompts
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #224:
URL: https://github.com/apache/apisix-docker/pull/224#discussion_r714411304
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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 ]")
Review comment:
```suggestion
@$(call func_echo_success_status, "$@ -> [ Done ]")
```
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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 ]")
Review comment:
```suggestion
@$(call func_echo_success_status, "$@ -> [ Done ]")
```
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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
# Actually it is not build on certain version but on local code
# 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 ]")
Review comment:
```suggestion
@$(call func_echo_success_status, "$@ -> [ Done ]")
```
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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
# Actually it is not build on certain version but on local code
# 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 ]")
Review comment:
```suggestion
@$(call func_echo_success_status, "$@ -> [ Done ]")
```
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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
# Actually it is not build on certain version but on local code
# 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 ]")
Review comment:
DItto.
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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
# Actually it is not build on certain version but on local code
# 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 ]")
Review comment:
```suggestion
@$(call func_echo_success_status, "$@ -> [ Done ]")
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] leslie-tsang commented on a change in pull request #224: chore: add more makefile output prompts
Posted by GitBox <gi...@apache.org>.
leslie-tsang commented on a change in pull request #224:
URL: https://github.com/apache/apisix-docker/pull/224#discussion_r714413510
##########
File path: Makefile
##########
@@ -63,86 +63,110 @@ 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
# Actually it is not build on certain version but on local code
# 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 ]")
Review comment:
@tokers fix it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] bzp2010 merged pull request #224: chore: add more makefile output prompts
Posted by GitBox <gi...@apache.org>.
bzp2010 merged pull request #224:
URL: https://github.com/apache/apisix-docker/pull/224
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org