diff --git a/Makefile b/Makefile index ff0f479de..68eb0ae71 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ proto: protoc --proto_path=./server/common/model/src/main/resources/proto --java_out=server/common/model/src/main/java server/common/model/src/main/resources/proto/*.proto # protoc-3.5.1 image_build: - docker build . -f docker/Dockerfile -t sofastack/sofaregistry:$(VERSION) + docker build . -f docker/Dockerfile -t sofaregistry/sofaregistry:$(VERSION) image_push: - docker push sofastack/sofaregistry:$(VERSION) + docker push sofaregistry/sofaregistry:$(VERSION) diff --git a/README.md b/README.md index 2bfa764ca..b1dfbfefd 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # SOFARegistry -[![Java CI with Maven](https://github.com/sofastack/sofa-registry/actions/workflows/unit-test.yml/badge.svg)](https://github.com/sofastack/sofa-registry/actions/workflows/unit-test.yml) +[![unit test](https://github.com/sofastack/sofa-registry/actions/workflows/unit-test.yml/badge.svg)](https://github.com/sofastack/sofa-registry/actions/workflows/unit-test.yml) +[![integration test](https://github.com/sofastack/sofa-registry/actions/workflows/integration-test.yml/badge.svg)](https://github.com/sofastack/sofa-registry/actions/workflows/integration-test.yml) ![license](https://img.shields.io/badge/license-Apache--2.0-green.svg) [![codecov](https://codecov.io/gh/sofastack/sofa-registry/branch/master/graph/badge.svg?token=K6x7h4Uxkn)](https://codecov.io/gh/sofastack/sofa-registry) ![maven](https://img.shields.io/github/release/sofastack/sofa-registry.svg) -SOFARegistry 是蚂蚁金服开源的一个生产级、高时效、高可用的服务注册中心。SOFARegistry 最早源自于淘宝的 ConfigServer，十年来，随着蚂蚁金服的业务发展，注册中心架构已经演进至第五代。目前 SOFARegistry 不仅全面服务于蚂蚁金服的自有业务，还随着蚂蚁金融科技服务众多合作伙伴，同时也兼容开源生态。SOFARegistry 采用 AP 架构，支持秒级时效性推送，同时采用分层架构支持无限水平扩展。 +SOFARegistry 是蚂蚁金服开源的一个生产级、高时效、高可用的服务注册中心。SOFARegistry 最早源自于淘宝的 ConfigServer，十年来，随着蚂蚁金服的业务发展，注册中心架构已经演进至第六代。目前 SOFARegistry 不仅全面服务于蚂蚁金服的自有业务，还随着蚂蚁金融科技服务众多合作伙伴，同时也兼容开源生态。SOFARegistry 采用 AP 架构，支持秒级时效性推送，同时采用分层架构支持无限水平扩展。 ## 功能特性 @@ -14,7 +15,7 @@ SOFARegistry 是蚂蚁金服开源的一个生产级、高时效、高可用的 - 丰富的 REST 接口 - 采用分层架构及数据分片，支持海量连接及海量数据 - 支持多副本备份，保证数据高可用 -- 基于 [SOFABolt](https://github.com/alipay/sofa-bolt) 通信框架，服务上下线秒级通知 +- 基于 [SOFABolt](https://github.com/alipay/sofa-bolt) 通信框架，服务上下线秒级通知 - AP 架构，保证网络分区下的可用性 @@ -29,21 +30,21 @@ SOFARegistry 是蚂蚁金服开源的一个生产级、高时效、高可用的 ## 文档 - [快速开始](https://www.sofastack.tech/sofa-registry/docs/Server-QuickStart) -- [开发手册](https://www.sofastack.tech/sofa-registry/docs/JAVA-SDK)  -- [运维手册](https://www.sofastack.tech/sofa-registry/docs/Deployment)  -- [发布历史](https://www.sofastack.tech/sofa-registry/docs/ReleaseNotes)  -- [发展路线](https://www.sofastack.tech/sofa-registry/docs/RoadMap)  +- [开发手册](https://www.sofastack.tech/sofa-registry/docs/JAVA-SDK) +- [运维手册](https://www.sofastack.tech/sofa-registry/docs/Deployment) +- [发布历史](https://www.sofastack.tech/sofa-registry/docs/ReleaseNotes) +- [发展路线](https://www.sofastack.tech/sofa-registry/docs/RoadMap) ## 贡献 -[如何参与 SOFARegistry 代码贡献](https://www.sofastack.tech/sofa-registry/docs/Contributing)  +[如何参与 SOFARegistry 代码贡献](https://www.sofastack.tech/sofa-registry/docs/Contributing) ## 致谢 -SOFARegistry 最早源于阿里内部的 ConfigServer，感谢毕玄创造了 ConfigServer，使 SOFARegistry 的发展有了良好的基础。同时，部分代码参考了 Netflix 的 [Eureka](https://github.com/Netflix/eureka)，感谢 Netflix 开源了如此优秀框架。 +SOFARegistry 最早源于阿里内部的 ConfigServer，感谢毕玄创造了 ConfigServer，使 SOFARegistry 的发展有了良好的基础。同时，部分代码参考了 Netflix 的 [Eureka](https://github.com/Netflix/eureka)，感谢 Netflix 开源了如此优秀框架。 ## 开源许可 -SOFARPC 基于 [Apache License 2.0](https://github.com/alipay/sofa-rpc/blob/master/LICENSE) 协议，SOFARPC 依赖了一些三方组件，它们的开源协议参见[依赖组件版权说明](http://www.sofastack.tech/sofa-rpc/docs/NOTICE)。 +SOFARegistry 基于 [Apache License 2.0](https://github.com/sofastack/sofa-registry/blob/master/LICENSE) 协议 diff --git a/docker/kube/sofa-registry/base-integration/integration.yaml b/docker/kube/sofa-registry/base-integration/integration.yaml index 395cfdf9b..46f456cbc 100644 --- a/docker/kube/sofa-registry/base-integration/integration.yaml +++ b/docker/kube/sofa-registry/base-integration/integration.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: sofa-registry - image: sofastack/sofaregistry:6.1.4 + image: sofaregistry/sofaregistry:6.1.4 env: - name: REGISTRY_APP_NAME value: integration diff --git a/docker/kube/sofa-registry/base-standalone/data.yaml b/docker/kube/sofa-registry/base-standalone/data.yaml index b7c4588f4..ab9133e33 100644 --- a/docker/kube/sofa-registry/base-standalone/data.yaml +++ b/docker/kube/sofa-registry/base-standalone/data.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: sofa-registry - image: sofastack/sofaregistry:6.1.4 + image: sofaregistry/sofaregistry:6.1.4 env: - name: REGISTRY_APP_NAME value: data diff --git a/docker/kube/sofa-registry/base-standalone/meta.yaml b/docker/kube/sofa-registry/base-standalone/meta.yaml index ab68e64ef..02cd8cec0 100644 --- a/docker/kube/sofa-registry/base-standalone/meta.yaml +++ b/docker/kube/sofa-registry/base-standalone/meta.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: sofa-registry - image: sofastack/sofaregistry:6.1.4 + image: sofaregistry/sofaregistry:6.1.4 env: - name: REGISTRY_APP_NAME value: meta diff --git a/docker/kube/sofa-registry/base-standalone/session.yaml b/docker/kube/sofa-registry/base-standalone/session.yaml index 48ecfc7b2..b8df388e2 100644 --- a/docker/kube/sofa-registry/base-standalone/session.yaml +++ b/docker/kube/sofa-registry/base-standalone/session.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: sofa-registry - image: sofastack/sofaregistry:6.1.4 + image: sofaregistry/sofaregistry:6.1.4 env: - name: REGISTRY_APP_NAME value: session diff --git a/docker/kube/sofa-registry/overlays/integration-dc1/kustomization.yaml b/docker/kube/sofa-registry/overlays/integration-dc1/kustomization.yaml index 018a426b9..373625a7e 100644 --- a/docker/kube/sofa-registry/overlays/integration-dc1/kustomization.yaml +++ b/docker/kube/sofa-registry/overlays/integration-dc1/kustomization.yaml @@ -6,5 +6,5 @@ patchesStrategicMerge: - db-secret-patch.yaml - configmap-patch.yaml images: - - name: sofastack/sofaregistry + - name: sofaregistry/sofaregistry newTag: 6.1.4 \ No newline at end of file diff --git a/docker/kube/sofa-registry/overlays/standalone-dc2/kustomization.yaml b/docker/kube/sofa-registry/overlays/standalone-dc2/kustomization.yaml index fc95723d8..d99139d71 100644 --- a/docker/kube/sofa-registry/overlays/standalone-dc2/kustomization.yaml +++ b/docker/kube/sofa-registry/overlays/standalone-dc2/kustomization.yaml @@ -8,5 +8,5 @@ patchesStrategicMerge: - db-secret-patch.yaml - configmap-patch.yaml images: - - name: sofastack/sofaregistry + - name: sofaregistry/sofaregistry newTag: 6.1.4 \ No newline at end of file