This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu-website.git
The following commit(s) were added to refs/heads/main by this push:
new c71052f [DOC #339] Add deployment documentation for PostgreSql
support in version 2.4.1. (#363)
c71052f is described below
commit c71052f9a1e352434f9be831a96862a967be25cb
Author: Shawn Jim <[email protected]>
AuthorDate: Mon Nov 15 21:28:14 2021 +0800
[DOC #339] Add deployment documentation for PostgreSql support in version
2.4.1. (#363)
* [DOC #339] Add deployment documentation for PostgreSql support in version
2.4.1.
* [DOC #339] Add deployment documentation for PostgreSql support in version
2.4.1.
* [DOC #339] Revert `doc\deployment\deployment-docker.md`.
* [DOC #339] Revert `doc\deployment\deployment-docker.md`.
* [DOC #339] Add deployment documentation for PostgreSql support in version
2.4.1.
* [DOC #339] Pass CICD.
---
docs/deployment/deployment-docker.md | 2 +-
.../current/deployment/deployment-docker.md | 14 +++++++++++++-
.../current/deployment/deployment-local.md | 2 ++
.../current/deployment/deployment-package.md | 16 ++++++++++++----
.../version-2.4.1/deployment/deployment-docker.md | 5 +++--
.../version-2.4.1/deployment/deployment-docker.md | 16 ++++++++++++++--
6 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/docs/deployment/deployment-docker.md
b/docs/deployment/deployment-docker.md
index 07c0e9a..1cb1955 100644
--- a/docs/deployment/deployment-docker.md
+++ b/docs/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
```
-another way is to put the `application.yml` configuration in
${your_work_dir}/conf, and then execute the following statement：
+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：
```
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
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 f25aee1..8109966 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
@@ -26,12 +26,24 @@ description: docker部署
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
```
-另外一种方式把 `application.yml` 配置放到`${your_work_dir}/conf`， 然后执行以下语句：
+另外一种方式, 从
[配置文件地址](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
中把 `application.yml`、`application-mysql.yml`、`application-pg.yml`
配置放到`${your_work_dir}/conf` ， 然后执行以下语句：
```
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
```
+* 使用 `PostgreSql` 来存储后台数据, 执行以下语句：
+
+```
+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
+```
+
+另外一种方式, 从
[配置文件地址](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
中把 `application.yml`、`application-mysql.yml`、`application-pg.yml`
配置放到`${your_work_dir}/conf` ， 然后执行以下语句：
+
+```
+docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf/ -d -p 9095:9095
--net shenyu apache/shenyu-admin
+```
+
### 启动Apache ShenYu Bootstrap
```
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-local.md
b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-local.md
index d331c10..ab77e89 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-local.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-local.md
@@ -30,6 +30,8 @@ description: 本地部署
* 如果使用`MySQL`来存储，修改 `application.yaml` 中的 `mysql` 配置。
+ * 如果使用`PostgreSql`来存储，修改 `application.yaml` 中的 `spring.profiles.active` 配置为
`pg`。
+
* 使用开发工具启动 `org.apache.shenyu.bootstrap.ShenyuBootstrapApplication`。
diff --git
a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-package.md
b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-package.md
index 7393c66..7616985 100644
---
a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-package.md
+++
b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-package.md
@@ -10,9 +10,9 @@ description: 二进制包部署
### 启动 Apache ShenYu Admin
-* 下载 `apache-shenyu-incubating-2.4.0-admin-bin.tar.gz`
+* 下载 `apache-shenyu-incubating-2.4.1-admin-bin.tar.gz`
-* 解压缩 `apache-shenyu-incubating-2.4.0-admin-bin.tar.gz`。 进入 `bin` 目录。
+* 解压缩 `apache-shenyu-incubating-2.4.1-admin-bin.tar.gz`。 进入 `bin` 目录。
* 使用 `h2` 来存储后台数据：
@@ -30,11 +30,19 @@ description: 二进制包部署
> linux: ./start.sh
```
+* 使用 `PostgreSql` 来存储后台数据， 进入 `/conf` 目录，修改 `application.yaml` 中
`spring.profiles.active` 的配置为 `pg`。
+
+```
+> windows: start.bat
+
+> linux: ./start.sh
+```
+
### 启动 Apache ShenYu Bootstrap
-* 下载 `apache-shenyu-incubating-2.4.0-bootstrap-bin.tar.gz`
+* 下载 `apache-shenyu-incubating-2.4.1-bootstrap-bin.tar.gz`
-* 解压缩 `apache-shenyu-incubating-2.4.0-bootstrap-bin.tar.gz`。 进入 bin 目录。
+* 解压缩 `apache-shenyu-incubating-2.4.1-bootstrap-bin.tar.gz`。 进入 bin 目录。
```
> windwos : start.bat
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 6f3a7d0..82c96ca 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
@@ -4,6 +4,7 @@ title: Docker部署
keywords: ["Docker", "部署"]
description: docker部署
---
+--
本文介绍使用 `docker` 来部署 `Apache ShenYu` 网关。
@@ -26,7 +27,7 @@ description: docker部署
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
```
-另外一种方式把 `application.yml` 配置放到`${your_work_dir}/conf`， 然后执行以下语句：
+另外一种方式, 从
[配置文件地址](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
中把 `application.yml`、`application-mysql.yml`、`application-pg.yml`
配置放到`${your_work_dir}/conf` ， 然后执行以下语句：
```
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
@@ -38,7 +39,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
```
-另外一种方式把 `application.yml` 配置放到`${your_work_dir}/conf`， 然后执行以下语句：
+另外一种方式, 从
[配置文件地址](https://github.com/apache/incubator-shenyu/blob/master/shenyu-admin/src/main/resources/)
中把 `application.yml`、`application-mysql.yml`、`application-pg.yml`
配置放到`${your_work_dir}/conf` ， 然后执行以下语句：
```
docker run -v ${your_work_dir}/conf:/opt/shenyu-admin/conf -d -p 9095:9095
--net shenyu apache/shenyu-admin
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 b765224..8b133b3 100644
--- a/versioned_docs/version-2.4.1/deployment/deployment-docker.md
+++ b/versioned_docs/version-2.4.1/deployment/deployment-docker.md
@@ -26,10 +26,22 @@ 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
```
-another way is to put the `application.yml` configuration in
${your_work_dir}/conf, and then execute the following statement：
+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：
```
-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
+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
+```
+
+* use `PostgreSql` to store data, execute the following statement：
+
+```
+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
+```
+
+another way is to put the `application.yml` configuration in
${your_work_dir}/conf, 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
```
* use `PostgreSql` to store data, execute the following statement：
