This is an automated email from the ASF dual-hosted git repository.
AlinsRan pushed a commit to branch feat/webhook-adc-validation
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/feat/webhook-adc-validation by
this push:
new 9b1533e5 fix: proxy docker hub pulls in self-hosted e2e
9b1533e5 is described below
commit 9b1533e5a650a50580e2e60f3179fe68ae3b63d7
Author: rongxin <[email protected]>
AuthorDate: Mon Apr 27 17:21:20 2026 +0800
fix: proxy docker hub pulls in self-hosted e2e
Co-authored-by: Copilot <[email protected]>
---
.github/workflows/e2e-test-k8s.yml | 9 ---------
Makefile | 10 +++-------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/e2e-test-k8s.yml
b/.github/workflows/e2e-test-k8s.yml
index 82b1f96b..94f0e2f2 100644
--- a/.github/workflows/e2e-test-k8s.yml
+++ b/.github/workflows/e2e-test-k8s.yml
@@ -62,13 +62,6 @@ jobs:
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
- - name: Login to Registry
- uses: docker/login-action@v3
- with:
- registry: ${{ secrets.DOCKER_REGISTRY }}
- username: ${{ secrets.DOCKER_USERNAME }}
- password: ${{ secrets.DOCKER_PASSWORD }}
-
- name: Launch Kind Cluster
env:
KIND_NODE_IMAGE: kindest/node:v1.18.15
@@ -109,8 +102,6 @@ jobs:
make download-api7ee3-chart
- name: Loading Docker Image to Kind Cluster
- env:
- DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
run: |
make kind-load-images
diff --git a/Makefile b/Makefile
index 1e8d8897..5346d411 100644
--- a/Makefile
+++ b/Makefile
@@ -245,13 +245,9 @@ pull-infra-images:
retry_pull "hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev"
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev"; \
retry_pull
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)"
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)"; \
retry_pull
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)"
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)"; \
- if [ -n "$$DOCKER_REGISTRY" ]; then \
- retry_pull "$$DOCKER_REGISTRY/kennethreitz/httpbin:latest"
"kennethreitz/httpbin:latest"; \
- retry_pull "$$DOCKER_REGISTRY/jmalloc/echo-server:latest"
"jmalloc/echo-server:latest"; \
- else \
- retry_pull "kennethreitz/httpbin:latest"
"kennethreitz/httpbin:latest"; \
- retry_pull "jmalloc/echo-server:latest"
"jmalloc/echo-server:latest"; \
- fi; \
+ dockerhub_proxy="$${DOCKERHUB_PROXY:-docker.m.daocloud.io}"; \
+ retry_pull "$$dockerhub_proxy/kennethreitz/httpbin:latest"
"kennethreitz/httpbin:latest"; \
+ retry_pull "$$dockerhub_proxy/jmalloc/echo-server:latest"
"jmalloc/echo-server:latest"; \
retry_pull "ghcr.io/api7/adc:dev" "ghcr.io/api7/adc:dev"; \
retry_pull "apache/apisix:dev" "apache/apisix:dev"; \
retry_pull "openresty/openresty:1.27.1.2-4-bullseye-fat"
"openresty/openresty:1.27.1.2-4-bullseye-fat"
