Skip to content

conflict: chore(e2e-test): optimize the startup speed of OpenResty/Nginx (#2617) (e3c2f81) #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

conflict: chore(e2e-test): optimize the startup speed of OpenResty/Nginx (#2617) (e3c2f81) #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ kind-load-images: pull-infra-images kind-load-ingress-image kind-load-adc-image
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
@kind load docker-image kennethreitz/httpbin:latest --name $(KIND_NAME)
@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
<<<<<<< HEAD
@kind load docker-image apache/apisix:dev --name $(KIND_NAME)

.PHONY: kind-load-gateway-image
Expand All @@ -215,6 +216,9 @@ kind-load-gateway-image:
kind-load-dashboard-images:
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
=======
@kind load docker-image openresty/openresty:1.27.1.2-4-bullseye-fat --name $(KIND_NAME)
>>>>>>> e3c2f816 (chore(e2e-test): optimize the startup speed of OpenResty/Nginx (#2617))

.PHONY: kind-load-ingress-image
kind-load-ingress-image:
Expand All @@ -233,8 +237,12 @@ pull-infra-images:
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)
@docker pull kennethreitz/httpbin:latest
@docker pull jmalloc/echo-server:latest
<<<<<<< HEAD
@docker pull ghcr.io/api7/adc:dev
@docker pull apache/apisix:dev
=======
@docker pull openresty/openresty:1.27.1.2-4-bullseye-fat
>>>>>>> e3c2f816 (chore(e2e-test): optimize the startup speed of OpenResty/Nginx (#2617))

##@ Build

Expand Down