From b7a30669a1a7a3a54c36ea1473c642bc817e0d85 Mon Sep 17 00:00:00 2001 From: Kent Dong Date: Tue, 3 Sep 2024 19:31:58 +0800 Subject: [PATCH] fix: Replace Docker Hub with AliCloud ACR (#1278) --- Makefile.core.mk | 8 ++++---- tools/hack/build-wasm-plugins.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 891f81c19..628c54b14 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -285,11 +285,11 @@ delete-cluster: $(tools/kind) ## Delete kind cluster. kube-load-image: $(tools/kind) ## Install the Higress image to a kind cluster using the provided $IMAGE and $TAG. tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/higress $(TAG) tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/dubbo-provider-demo 0.0.3-x86 - tools/hack/docker-pull-image.sh docker.io/alihigress/nacos-standlone-rc3 1.0.0-RC3 + tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/nacos-standlone-rc3 1.0.0-RC3 tools/hack/docker-pull-image.sh docker.io/hashicorp/consul 1.16.0 tools/hack/docker-pull-image.sh docker.io/charlie1380/eureka-registry-provider v0.3.0 tools/hack/docker-pull-image.sh docker.io/bitinit/eureka latest - tools/hack/docker-pull-image.sh docker.io/alihigress/httpbin 1.0.2 + tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/httpbin 1.0.2 tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/echo-server 1.3.0 tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/echo-server v1.0 tools/hack/docker-pull-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/echo-body 1.0.0 @@ -297,9 +297,9 @@ kube-load-image: $(tools/kind) ## Install the Higress image to a kind cluster us tools/hack/docker-pull-image.sh registry.cn-hangzhou.aliyuncs.com/2456868764/httpbin 1.0.2 tools/hack/docker-pull-image.sh registry.cn-hangzhou.aliyuncs.com/hinsteny/nacos-standlone-rc3 1.0.0-RC3 tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/dubbo-provider-demo 0.0.3-x86 - tools/hack/kind-load-image.sh docker.io/alihigress/nacos-standlone-rc3 1.0.0-RC3 + tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/nacos-standlone-rc3 1.0.0-RC3 tools/hack/kind-load-image.sh docker.io/hashicorp/consul 1.16.0 - tools/hack/kind-load-image.sh docker.io/alihigress/httpbin 1.0.2 + tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/httpbin 1.0.2 tools/hack/kind-load-image.sh docker.io/charlie1380/eureka-registry-provider v0.3.0 tools/hack/kind-load-image.sh docker.io/bitinit/eureka latest tools/hack/kind-load-image.sh higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/echo-server 1.3.0 diff --git a/tools/hack/build-wasm-plugins.sh b/tools/hack/build-wasm-plugins.sh index fe9f53ffd..5d36007c5 100755 --- a/tools/hack/build-wasm-plugins.sh +++ b/tools/hack/build-wasm-plugins.sh @@ -42,7 +42,7 @@ then name=${file##*/} echo "🚀 Build Rust WasmPlugin: $name" PLUGIN_NAME=${name} make lint - PLUGIN_NAME=${name} BUILDER_REGISTRY="docker.io/alihigress/plugins-rust-" make build + PLUGIN_NAME=${name} make build fi done else @@ -69,7 +69,7 @@ else version=$(cat "$version_file") if [[ "$version" =~ -alpha$ ]]; then echo "🚀 Build Go WasmPlugin: $name (version $version)" - PLUGIN_NAME=${name} BUILDER_REGISTRY="docker.io/alihigress/plugins-" make build + PLUGIN_NAME=${name} make build else echo "Plugin version $version not ends with '-alpha', skipping compilation for $name." fi