You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/07/01 13:38:58 UTC
[shardingsphere] branch master updated: Changed directory names
under the example (#11095)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 5320467 Changed directory names under the example (#11095)
5320467 is described below
commit 5320467b349787d5d1ba978d2b9ce45217544c63
Author: Kyujin Nam <ky...@gmail.com>
AuthorDate: Thu Jul 1 22:38:25 2021 +0900
Changed directory names under the example (#11095)
* Revert "Update Readme of docker-compose (#11082)"
This reverts commit e346390f
* Changed directory names under the example
- */sharding-jdbc/*, */sharding-proxy/* were named after the legacy version
- changed directory name. sharding-jdbc to shardingsphere-jdbc, sharding-proxy to shardingsphere-proxy
---
examples/docker/docker-compose-zh.md | 4 ++--
examples/docker/docker-compose.md | 4 ++--
.../sharding/docker-compose.yml | 0
.../governance/docker-compose.yml | 0
.../docker/{sharding-proxy => shardingsphere-proxy}/governance/run.sh | 0
.../{sharding-proxy => shardingsphere-proxy}/governance/stop.sh | 0
.../sharding/conf/config-sharding.yaml | 0
.../sharding/conf/server.yaml | 0
.../sharding/docker-compose.yml | 0
9 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/docker/docker-compose-zh.md b/examples/docker/docker-compose-zh.md
index 1e614f7..6b89cfd 100644
--- a/examples/docker/docker-compose-zh.md
+++ b/examples/docker/docker-compose-zh.md
@@ -4,7 +4,7 @@
#### ShardingSphere-JDBC
-1. 运行 'cd docker/sharding-jdbc/sharding',进入 docker 文件夹
+1. 运行 'cd docker/shardingsphere-jdbc/sharding',进入 docker 文件夹
2. 运行 'docker-compose up -d',启动 docker compose 环境
3. 根据需要,开启 mysql/etcd/zookeeper
4. 如果有端口冲突,在 docker-compose.yml 中修改相应的端口,然后再次使用 'docker-compose up -d' 启动 docker compose
@@ -12,7 +12,7 @@
#### ShardingSphere-Proxy
-1. 运行 'cd docker/sharding-proxy/sharding',进入 docker 文件夹
+1. 运行 'cd docker/shardingsphere-proxy/sharding',进入 docker 文件夹
2. 运行 'docker-compose up -d',启动 docker compose 环境
3. 运行 `mysql -h127.0.0.1 -P13308 -proot -uroot` 登录代理
4. 如果有端口冲突,在docker-compose.yml中修改相应的端口,然后再次使用 'docker-compose up -d'启动docker compose
diff --git a/examples/docker/docker-compose.md b/examples/docker/docker-compose.md
index 80bd158..56c79d3 100644
--- a/examples/docker/docker-compose.md
+++ b/examples/docker/docker-compose.md
@@ -4,7 +4,7 @@ before we use docker compose, please install docker and docker-compose first : h
#### ShardingSphere-JDBC
-1. access the docker folder (cd docker/sharding-jdbc/sharding)
+1. access the docker folder (cd docker/shardingsphere-jdbc/sharding)
2. launch the environment by docker compose (docker-compose up -d)
3. access mysql / etcd / zookeeper as you want
4. if there is conflict on port, just modify the corresponding port defined in docker-compose.yml and then launch docker compose again(docker-compose up -d)
@@ -12,7 +12,7 @@ before we use docker compose, please install docker and docker-compose first : h
#### ShardingSphere-Proxy
-1. access the docker folder (cd docker/sharding-proxy/sharding)
+1. access the docker folder (cd docker/shardingsphere-proxy/sharding)
2. launch the environment by docker compose (docker-compose up -d)
3. access proxy by `mysql -h127.0.0.1 -P13308 -proot -uroot`
4. if there is conflict on port, just modify the corresponding port defined in docker-compose.yml and then launch docker compose again(docker-compose up -d)
diff --git a/examples/docker/sharding-jdbc/sharding/docker-compose.yml b/examples/docker/shardingsphere-jdbc/sharding/docker-compose.yml
similarity index 100%
rename from examples/docker/sharding-jdbc/sharding/docker-compose.yml
rename to examples/docker/shardingsphere-jdbc/sharding/docker-compose.yml
diff --git a/examples/docker/sharding-proxy/governance/docker-compose.yml b/examples/docker/shardingsphere-proxy/governance/docker-compose.yml
similarity index 100%
rename from examples/docker/sharding-proxy/governance/docker-compose.yml
rename to examples/docker/shardingsphere-proxy/governance/docker-compose.yml
diff --git a/examples/docker/sharding-proxy/governance/run.sh b/examples/docker/shardingsphere-proxy/governance/run.sh
similarity index 100%
rename from examples/docker/sharding-proxy/governance/run.sh
rename to examples/docker/shardingsphere-proxy/governance/run.sh
diff --git a/examples/docker/sharding-proxy/governance/stop.sh b/examples/docker/shardingsphere-proxy/governance/stop.sh
similarity index 100%
rename from examples/docker/sharding-proxy/governance/stop.sh
rename to examples/docker/shardingsphere-proxy/governance/stop.sh
diff --git a/examples/docker/sharding-proxy/sharding/conf/config-sharding.yaml b/examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
similarity index 100%
rename from examples/docker/sharding-proxy/sharding/conf/config-sharding.yaml
rename to examples/docker/shardingsphere-proxy/sharding/conf/config-sharding.yaml
diff --git a/examples/docker/sharding-proxy/sharding/conf/server.yaml b/examples/docker/shardingsphere-proxy/sharding/conf/server.yaml
similarity index 100%
rename from examples/docker/sharding-proxy/sharding/conf/server.yaml
rename to examples/docker/shardingsphere-proxy/sharding/conf/server.yaml
diff --git a/examples/docker/sharding-proxy/sharding/docker-compose.yml b/examples/docker/shardingsphere-proxy/sharding/docker-compose.yml
similarity index 100%
rename from examples/docker/sharding-proxy/sharding/docker-compose.yml
rename to examples/docker/shardingsphere-proxy/sharding/docker-compose.yml