ci: docker compose add compatible apple chip platform (#806)

arana-db · Dec 4, 2023 · 3f62d64 · 3f62d64
1 parent ebec740
commit 3f62d64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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)
 	}