SkyeYoung commented on code in PR #12322:
URL: https://github.com/apache/apisix/pull/12322#discussion_r2148991818
##########
Makefile:
##########
@@ -497,23 +497,27 @@ ci-env-stop:
build-on-debian-dev:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-debian-dev \
+ --build-arg TARGETARCH=$(ENV_OS_ARCH) \
--build-arg CODE_PATH=. \
--build-arg
ENTRYPOINT_PATH=./docker/debian-dev/docker-entrypoint.sh \
--build-arg
INSTALL_BROTLI=./docker/debian-dev/install-brotli.sh \
--build-arg
CHECK_STANDALONE_CONFIG=./docker/utils/check_standalone_config.sh \
-f ./docker/debian-dev/Dockerfile .
@$(call func_echo_success_status, "$@ -> [ Done ]")
-### push-multiarch-dev-on-debian : Push apache/apisix:dev image
-.PHONY: push-multiarch-dev-on-debian
-push-multiarch-dev-on-debian:
+.PHONY: push-on-debian-dev
+push-on-debian-dev:
@$(call func_echo_status, "$@ -> [ Start ]")
- $(ENV_DOCKER) buildx build --network=host --push \
- -t $(IMAGE_NAME):dev \
- --platform linux/amd64,linux/arm64 \
- --build-arg CODE_PATH=. \
- --build-arg
ENTRYPOINT_PATH=./docker/debian-dev/docker-entrypoint.sh \
- --build-arg
INSTALL_BROTLI=./docker/debian-dev/install-brotli.sh \
- --build-arg
CHECK_STANDALONE_CONFIG=./docker/utils/check_standalone_config.sh \
- -f ./docker/debian-dev/Dockerfile .
+ $(ENV_DOCKER) tag $(ENV_APISIX_IMAGE_TAG_NAME)-debian-dev
$(IMAGE_NAME):dev-$(ENV_OS_ARCH)
+ $(ENV_DOCKER) push $(IMAGE_NAME):dev-$(ENV_OS_ARCH)
+ @$(call func_echo_success_status, "$@ -> [ Done ]")
+
+### merge-dev-tags : Merge architecture-specific dev tags into a single dev tag
+.PHONY: merge-dev-tags
+merge-dev-tags:
+ @$(call func_echo_status, "$@ -> [ Start ]")
+ $(ENV_DOCKER) manifest create $(IMAGE_NAME):dev \
+ $(IMAGE_NAME):dev-amd64 \
+ $(IMAGE_NAME):dev-arm64
Review Comment:
If not deleted, it's convenient to pull images of non-device architectures
on some devices (like a MacBook) for testing purposes, but this use case is
rare.
--
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-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
