This is an automated email from the ASF dual-hosted git repository.
dengliming pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shenyu-website.git
The following commit(s) were added to refs/heads/main by this push:
new 361cc86f547 Fix docker-deployment doc (#825)
361cc86f547 is described below
commit 361cc86f547d0d4ac5a3b76a06e0ba0f6880f138
Author: mahaitao <[email protected]>
AuthorDate: Thu Nov 17 20:38:02 2022 +0800
Fix docker-deployment doc (#825)
* feat:fix deployment-docker
* feat:fix deployment-docker
Co-authored-by: mahaitao617 <[email protected]>
---
docs/deployment/deployment-docker.md | 6 +++---
.../current/deployment/deployment-docker.md | 2 +-
.../version-2.4.0/deployment/deployment-docker.md | 10 +++++++---
.../version-2.4.1/deployment/deployment-docker.md | 10 +++++++---
.../version-2.4.2/deployment/deployment-docker.md | 9 ++++-----
.../version-2.4.3/deployment/deployment-docker.md | 8 +++++---
.../version-2.5.0/deployment/deployment-docker.md | 8 +++++---
versioned_docs/version-2.4.1/deployment/deployment-docker.md | 2 +-
versioned_docs/version-2.4.3/deployment/deployment-docker.md | 6 +++---
versioned_docs/version-2.5.0/deployment/deployment-docker.md | 6 +++---
10 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/docs/deployment/deployment-docker.md
b/docs/deployment/deployment-docker.md
index 5db2f34c61d..93f6cae1cd3 100644
--- a/docs/deployment/deployment-docker.md
+++ b/docs/deployment/deployment-docker.md
@@ -35,7 +35,7 @@ This article introduces the use of `docker` to deploy the
`Apache ShenYu` gatewa
docker run --name shenyu-admin -v
/${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib -e
"SPRING_PROFILES_ACTIVE=mysql" -e
"spring.datasource.url=jdbc:mysql://${your_ip_port}/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull"
-e "spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/shenyu/blob/master/shenyu-admin/src/main/resources/)
, modify the configuration `spring.profiles.active = mysql` in
`application.yml`, and then execute the following statement：
+another way is to put the `application.yml`、`application-mysql.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/shenyu/blob/master/shenyu-admin/src/main/resources/)
, modify the configuration `spring.profiles.active = mysql` in
`application.yml`, and then execute the following statement：
```
docker run --name shenyu-admin -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
-v /${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib -d -p 9095:9095 --net
shenyu apache/shenyu-admin:${current.version}
@@ -47,7 +47,7 @@ docker run --name shenyu-admin -v
${your_work_dir}/conf:/opt/shenyu-admin/conf -
docker run --name shenyu-admin -e "SPRING_PROFILES_ACTIVE=pg" -e
"spring.datasource.url=jdbc:postgresql://${your_ip_port}/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false"
-e "spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = pg` in `application.yml`,and then execute the
following statement：
+another way is to put the `application.yml`、`application-pg.yml` configuration
in ${your_work_dir}/conf, modify the configuration `spring.profiles.active =
pg` in `application.yml`,and then execute the following statement：
```
docker run --name shenyu-admin -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
-d -p 9095:9095 --net shenyu apache/shenyu-admin:${current.version}
@@ -59,7 +59,7 @@ docker run --name shenyu-admin -v
${your_work_dir}/conf:/opt/shenyu-admin/conf -
docker run --name shenyu-admin -e "SPRING_PROFILES_ACTIVE=oracle" -e
"spring.datasource.url=jdbc:oracle:thin:@localhost:1521/shenyu" -e
"spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = oracle` in `application.yml`, and then execute the
following statement：
+another way is to put the `application.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = oracle` in `application.yml`, and then execute the
following statement：
```
docker run --name shenyu-admin -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
-d -p 9095:9095 --net shenyu apache/shenyu-admin:${current.version}
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-docker.md
b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-docker.md
index 999380a5afd..dae27d7c4c9 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-docker.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-docker.md
@@ -59,7 +59,7 @@ docker run --name shenyu-admin -v
${your_work_dir}/conf:/opt/shenyu-admin/conf -
docker run --name shenyu-admin -e "SPRING_PROFILES_ACTIVE=oracle" -e
"spring.datasource.url=jdbc:oracle:thin:@localhost:1521/shenyu" -e
"spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-另外一种方式, 从
[配置文件地址](https://github.com/apache/shenyu/blob/master/shenyu-admin/src/main/resources/)
中把
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
配置放到`${your_work_dir}/conf`， 调整`application.yml`中的配置`spring.profiles.active =
oracle`，然后执行以下语句：
+另外一种方式, 从
[配置文件地址](https://github.com/apache/shenyu/blob/master/shenyu-admin/src/main/resources/)
中把 `application.yml`、`application-oracle.yml` 配置放到`${your_work_dir}/conf`，
调整`application.yml`中的配置`spring.profiles.active = oracle`，然后执行以下语句：
```
docker run --name shenyu-admin -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
-d -p 9095:9095 --net shenyu apache/shenyu-admin:${current.version}
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-docker.md
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-docker.md
index 7bdc5ac340d..ef33c8487f0 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-docker.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-docker.md
@@ -35,9 +35,13 @@ docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf/
-v /${your_work_dir}
### 启动Apache ShenYu Bootstrap
```
-> docker network create shenyu
-> docker pull apache/shenyu-bootstrap:2.4.0
-> docker run -d -p 9195:9195 --net shenyu apache/shenyu-bootstrap:2.4.0
+> docker run -d \
+ -p 9195:9195 \
+ -v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
+ --name shenyu-bootstrap \
+ --net shenyu \
+ --env SHENYU_SYNC_WEBSOCKET_URLS=ws://shenyu-admin:9095/websocket \
+ apache/shenyu-bootstrap:${current.version}
```
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-docker.md
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-docker.md
index f77563c9ace..f55227853ec 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-docker.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-docker.md
@@ -48,9 +48,13 @@ docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
-d -p 9095:9095 --net
### 启动Apache ShenYu Bootstrap
```
-> docker network create shenyu
-> docker pull apache/shenyu-bootstrap:2.4.1
-> docker run -d -p 9195:9195 --net shenyu apache/shenyu-bootstrap:2.4.1
+> docker run -d \
+ -p 9195:9195 \
+ -v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
+ --name shenyu-bootstrap \
+ --net shenyu \
+ --env SHENYU_SYNC_WEBSOCKET_URLS=ws://shenyu-admin:9095/websocket \
+ apache/shenyu-bootstrap:${current.version}
```
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-docker.md
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-docker.md
index 790823b1c94..5b1a73bdefe 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-docker.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-docker.md
@@ -71,12 +71,11 @@ agent相关配置文件位于
[shenyu-dist/shenyu-agent-dist/src/main/resources/
附带参数 `agent` 表示启动 `shenyu-agent`。
```shell
-> docker network create shenyu
-> docker pull apache/shenyu-bootstrap:2.4.2
> docker run -d \
-p 9195:9195 \
- --net shenyu \
- -v $AGENT_CONF:/opt/shenyu-bootstrap/agent/conf \
-v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
- apache/shenyu-bootstrap:2.4.2 agent
+ --name shenyu-bootstrap \
+ --net shenyu \
+ --env SHENYU_SYNC_WEBSOCKET_URLS=ws://shenyu-admin:9095/websocket \
+ apache/shenyu-bootstrap:${current.version}
```
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-docker.md
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-docker.md
index 037d9baad0b..e3e16e5e6a4 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-docker.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-docker.md
@@ -63,9 +63,11 @@ docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
-d -p 9095:9095 --net
宿主机中，bootstrap的[配置文件](https://github.com/apache/incubator-shenyu/tree/master/shenyu-bootstrap/src/main/resources)所在目录记为
`$BOOTSTRAP_CONF`。
```shell
-> docker network create shenyu
-> docker pull apache/shenyu-bootstrap:${current.version}
> docker run -d \
- -p 9195:9195 \ -v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
+ -p 9195:9195 \
+ -v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
+ --name shenyu-bootstrap \
+ --net shenyu \
+ --env SHENYU_SYNC_WEBSOCKET_URLS=ws://shenyu-admin:9095/websocket \
apache/shenyu-bootstrap:${current.version}
```
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-docker.md
b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-docker.md
index 6d04beb4a3b..42a40a188bd 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-docker.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-docker.md
@@ -82,9 +82,11 @@ docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf \
宿主机中，bootstrap的[配置文件](https://github.com/apache/incubator-shenyu/tree/master/shenyu-bootstrap/src/main/resources)所在目录记为
`$BOOTSTRAP_CONF`。
```shell
-> docker network create shenyu
-> docker pull apache/shenyu-bootstrap:${current.version}
> docker run -d \
- -p 9195:9195 \ -v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
+ -p 9195:9195 \
+ -v $BOOTSTRAP_CONF:/opt/shenyu-bootstrap/conf \
+ --name shenyu-bootstrap \
+ --net shenyu \
+ --env SHENYU_SYNC_WEBSOCKET_URLS=ws://shenyu-admin:9095/websocket \
apache/shenyu-bootstrap:${current.version}
```
diff --git a/versioned_docs/version-2.4.1/deployment/deployment-docker.md
b/versioned_docs/version-2.4.1/deployment/deployment-docker.md
index 2eb37897312..92dfc0be65b 100644
--- a/versioned_docs/version-2.4.1/deployment/deployment-docker.md
+++ b/versioned_docs/version-2.4.1/deployment/deployment-docker.md
@@ -26,7 +26,7 @@ This article introduces the use of `docker` to deploy the
`Apache ShenYu` gatewa
docker run -v /${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib -e
"SPRING_PROFILES_ACTIVE=mysql" -e
"spring.datasource.url=jdbc:mysql://${your_ip_port}/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false"
-e "spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:2.4.1
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml` configuration in
${your_work_dir}/conf from [Configure
address](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
, and then execute the following statement：
+another way is to put the `application.yml`、`application-mysql.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
, and then execute the following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -v
/${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib -d -p 9095:9095 --net
shenyu apache/shenyu-admin:2.4.1
diff --git a/versioned_docs/version-2.4.3/deployment/deployment-docker.md
b/versioned_docs/version-2.4.3/deployment/deployment-docker.md
index 97804c66095..54cec607658 100644
--- a/versioned_docs/version-2.4.3/deployment/deployment-docker.md
+++ b/versioned_docs/version-2.4.3/deployment/deployment-docker.md
@@ -28,7 +28,7 @@ This article introduces the use of `docker` to deploy the
`Apache ShenYu` gatewa
docker run -v /${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib -e
"SPRING_PROFILES_ACTIVE=mysql" -e
"spring.datasource.url=jdbc:mysql://${your_ip_port}/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false"
-e "spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
, modify the configuration `spring.profiles.active = mysql` in
`application.yml`, and then execute the following statement：
+another way is to put the `application.yml`、`application-mysql.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
, modify the configuration `spring.profiles.active = mysql` in
`application.yml`, and then execute the following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -v
/${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib -d -p 9095:9095 --net
shenyu apache/shenyu-admin:${current.version}
@@ -40,7 +40,7 @@ docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -v
/${your_work_dir}/
docker run -e "SPRING_PROFILES_ACTIVE=pg" -e
"spring.datasource.url=jdbc:postgresql://${your_ip_port}/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false"
-e "spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = pg` in `application.yml`,and then execute the
following statement：
+another way is to put the `application.yml`、`application-pg.yml` configuration
in ${your_work_dir}/conf, modify the configuration `spring.profiles.active =
pg` in `application.yml`,and then execute the following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -d -p 9095:9095
--net shenyu apache/shenyu-admin:${current.version}
@@ -52,7 +52,7 @@ docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -d
-p 9095:9095 --net
docker run -e "SPRING_PROFILES_ACTIVE=oracle" -e
"spring.datasource.url=jdbc:oracle:thin:@localhost:1521/shenyu" -e
"spring.datasource.username=${your_username}" -e
"spring.datasource.password=${your_password}" -d -p 9095:9095 --net shenyu
apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = oracle` in `application.yml`, and then execute the
following statement：
+another way is to put the `application.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = oracle` in `application.yml`, and then execute the
following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -d -p 9095:9095
--net shenyu apache/shenyu-admin:${current.version}
diff --git a/versioned_docs/version-2.5.0/deployment/deployment-docker.md
b/versioned_docs/version-2.5.0/deployment/deployment-docker.md
index edffa33b54b..03817fc4e7e 100644
--- a/versioned_docs/version-2.5.0/deployment/deployment-docker.md
+++ b/versioned_docs/version-2.5.0/deployment/deployment-docker.md
@@ -34,7 +34,7 @@ docker run -v
/${your_work_dir}/ext-lib:/opt/shenyu-admin/ext-lib \
-d -p 9095:9095 --net shenyu apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/shenyu/blob/master/shenyu-admin/src/main/resources/)
, modify the configuration `spring.profiles.active = mysql` in
`application.yml`, and then execute the following statement：
+another way is to put the `application.yml`、`application-mysql.yml`
configuration in ${your_work_dir}/conf from [Configure
address](https://github.com/apache/shenyu/blob/master/shenyu-admin/src/main/resources/)
, modify the configuration `spring.profiles.active = mysql` in
`application.yml`, and then execute the following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf \
@@ -52,7 +52,7 @@ docker run -e "SPRING_PROFILES_ACTIVE=pg" \
-d -p 9095:9095 --net shenyu apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = pg` in `application.yml`,and then execute the
following statement：
+another way is to put the `application.yml`、`application-pg.yml` configuration
in ${your_work_dir}/conf, modify the configuration `spring.profiles.active =
pg` in `application.yml`,and then execute the following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf \
@@ -69,7 +69,7 @@ docker run -e "SPRING_PROFILES_ACTIVE=oracle"
-d -p 9095:9095 --net shenyu apache/shenyu-admin:${current.version}
```
-another way is to put the
`application.yml`、`application-mysql.yml`、`application-pg.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = oracle` in `application.yml`, and then execute the
following statement：
+another way is to put the `application.yml`、`application-oracle.yml`
configuration in ${your_work_dir}/conf, modify the configuration
`spring.profiles.active = oracle` in `application.yml`, and then execute the
following statement：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf
