From 3f62d64188cc02dd0738c8faf01350345bc30c6b Mon Sep 17 00:00:00 2001 From: baerwang <52104949+baerwang@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:24:16 +0800 Subject: [PATCH] ci: docker compose add compatible apple chip platform (#806) --- docker-compose.yaml | 2 ++ pkg/registry/discovery.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6dc6f0b1..47061dd8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -68,6 +68,7 @@ services: arana: container_name: arana + platform: linux/amd64 image: aranadb/arana:master entrypoint: [ "sh", "-c", "arana import -c /etc/arana/bootstrap.yaml -s /etc/arana/config.yaml; arana start -c /etc/arana/bootstrap.yaml" ] networks: @@ -83,6 +84,7 @@ services: restart: on-failure arana-admin: + platform: linux/amd64 container_name: arana-admin image: aranadb/arana:master entrypoint: [ "arana", "admin", "-c", "/etc/arana/bootstrap.yaml", "-p", "8088" ] diff --git a/pkg/registry/discovery.go b/pkg/registry/discovery.go index 845f87d0..e889dd1d 100644 --- a/pkg/registry/discovery.go +++ b/pkg/registry/discovery.go @@ -49,7 +49,7 @@ func InitDiscovery(storeType string, options map[string]interface{}) (base.Disco case base.ETCD: serviceDiscovery, err = initEtcdDiscovery(options) case base.NACOS: - initNacosV2Discovery(options) + serviceDiscovery, err = initNacosV2Discovery(options) default: err = errors.Errorf("Service registry not support store:%s", storeType) }