This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new 95f5a6f update backend deployment manual deployment instructions (#48)
95f5a6f is described below
commit 95f5a6f844c9a062a2d822a8056477ba94a9cf31
Author: lgcareer <[email protected]>
AuthorDate: Tue Dec 3 16:55:05 2019 +0800
update backend deployment manual deployment instructions (#48)
* add deploy on jetty
* add deploy on jetty
* Modify front-end deployment manual deployment instructions
* Modify backend deployment manual deployment instructions
---
docs/en-us/user_doc/backend-deployment.md | 26 +++++++++++++++++++-------
docs/zh-cn/user_doc/backend-deployment.md | 31 +++++++++++++++++++++++--------
2 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/docs/en-us/user_doc/backend-deployment.md
b/docs/en-us/user_doc/backend-deployment.md
index 1720db4..694f867 100755
--- a/docs/en-us/user_doc/backend-deployment.md
+++ b/docs/en-us/user_doc/backend-deployment.md
@@ -7,13 +7,14 @@ There are two deployment modes for the backend:
## Preparations
-Download the latest version of the installation package, download address：
[github
download](https://github.com/apache/incubator-dolphinscheduler/releases),
download dolphinscheduler-backend-x.x.x.tar.gz(back-end referred to as
dolphinscheduler-backend),dolphinscheduler-ui-x.x.x.tar.gz(front-end referred
to as dolphinscheduler-ui)
+Download the latest version of the installation package, download address：
[download](https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler),
+download
apache-dolphinscheduler-incubating-x.x.x-dolphinscheduler-backend-bin.tar.gz
#### Preparations 1: Installation of basic software (self-installation of
required items)
- * Mysql (5.5+) : Mandatory
+ * Mysql (5.5+) : Optional
* JDK (1.8+) : Mandatory
* ZooKeeper(3.4.6+) ：Mandatory
* Hadoop (2.6+) ：Optionally, if you need to use the resource upload function,
MapReduce task submission needs to configure Hadoop (uploaded resource files
are currently stored on Hdfs)
@@ -58,7 +59,7 @@ Configure SSH secret-free login on deployment machines and
other installation ma
```
* creates tables and imports basic data
- Modify the following attributes in ./conf/dao/data_source.properties
+ Modify the following attributes in ./conf/application-dao.properties
```
spring.datasource.url
@@ -78,8 +79,12 @@ Configure SSH secret-free login on deployment machines and
other installation ma
```directory
bin : Basic service startup script
+DISCLAIMER : DISCLAIMER
conf : Project Profile
lib : The project relies on jar packages, including individual module jars and
third-party jars
+LICENSE : LICENSE
+licenses : licenses
+NOTICE : NOTICE
script : Cluster Start, Stop and Service Monitor Start and Stop scripts
sql : The project relies on SQL files
install.sh : One-click deployment script
@@ -103,7 +108,7 @@ install.sh : One-click deployment script
## Deployment
-Automated deployment is recommended, and experienced partners can use source
deployment as well.
+Either of the following two methods can be deployed,automated deployment is
recommended, and experienced partners can use source deployment as well.
### Automated Deployment
@@ -146,12 +151,13 @@ After downloading the release version of the source
package, unzip it into the r
* Execute the compilation command：
```
- mvn -U clean package assembly:assembly -Dmaven.test.skip=true
+ mvn -U clean package -Prelease -Dmaven.test.skip=true
```
* View directory
-After normal compilation, ./target/dolphinscheduler-{version}/ is generated in
the current directory
+After normal compilation,
`apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-backend-bin.tar.gz`
+is generated in the `./dolphinscheduler-dist/dolphinscheduler-backend/target`
directory
### Start-and-stop services commonly used in systems (for service purposes,
please refer to System Architecture Design for details)
@@ -198,8 +204,14 @@ sh ./bin/dolphinscheduler-daemon.sh stop alert-server
```
## Database Upgrade
-Database upgrade is a function added in version 1.0.2. The database can be
upgraded automatically by executing the following command:
+Modify the following properties in ./conf/application-dao.properties
+ ```
+ spring.datasource.url
+ spring.datasource.username
+ spring.datasource.password
+ ```
+The database can be upgraded automatically by executing the following command:
```upgrade
sh ./script/upgrade-dolphinscheduler.sh
```
diff --git a/docs/zh-cn/user_doc/backend-deployment.md
b/docs/zh-cn/user_doc/backend-deployment.md
index 55518e5..57fb8c8 100755
--- a/docs/zh-cn/user_doc/backend-deployment.md
+++ b/docs/zh-cn/user_doc/backend-deployment.md
@@ -4,11 +4,11 @@
## 1、准备工作
-请下载最新版本的安装包，下载地址：
[github下载](https://github.com/apache/incubator-dolphinscheduler/releases)
+请下载最新版本的安装包，下载地址：
[下载](https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler)
#### 准备一: 基础软件安装(必装项请自行安装)
- * Mysql (5.5+) : 必装
+ * Mysql (5.5+) : 选装
* [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html)
(1.8+) : 必装
* ZooKeeper (3.4.6+) ：必装
* Hadoop (2.6+) ：选装， 如果需要使用到资源上传功能，MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)
@@ -54,7 +54,7 @@ dolphinscheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
```
* 创建表和导入基础数据
- 修改./conf/dao/data_source.properties中的下列属性
+ 修改./conf/application-dao.properties中的下列属性
```
spring.datasource.url
@@ -73,7 +73,11 @@ dolphinscheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
```
bin : 基础服务启动脚本
conf : 项目配置文件
+DISCLAIMER : DISCLAIMER文件
lib : 项目依赖jar包，包括各个模块jar和第三方jar
+LICENSE : LICENSE文件
+licenses : 运行时license
+NOTICE : NOTICE文件
script : 集群启动、停止和服务监控启停脚本
sql : 项目依赖sql文件
install.sh : 一键部署脚本
@@ -99,7 +103,7 @@ install.sh : 一键部署脚本
## 2、部署
-推荐自动化部署，有经验的小伙伴也可以使用源码部署
+以下两种方式任选其一部署即可，推荐自动化部署，有经验的小伙伴也可以使用源码部署
### 2.1 自动部署
@@ -141,20 +145,24 @@ install.sh : 一键部署脚本
* 执行编译命令：
```
- mvn -U clean package assembly:assembly -Dmaven.test.skip=true
+ mvn -U clean package -Prelease -Dmaven.test.skip=true
```
* 查看目录
-正常编译完后，会在当前目录生成 `./target/dolphinscheduler-{version}/`
+正常编译完后，会在 `dolphinscheduler-dist/dolphinscheduler-backend/target`目录下生成
+
`apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-backend-bin.tar.gz`
```查看目录
../
├── bin
├── conf
+ |── DISCLAIMER
|—— install.sh
|—— lib
- |—— logs
+ |—— LICENSE
+ |—— licenses
+ |—— NOTICE
|—— script
|—— sql
```
@@ -204,7 +212,14 @@ sh ./bin/dolphinscheduler-daemon.sh stop alert-server
```
## 3、数据库升级
-数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库
+修改./conf/application-dao.properties中的下列属性
+
+ ```
+ spring.datasource.url
+ spring.datasource.username
+ spring.datasource.password
+ ```
+执行以下命令即可自动升级数据库
```
sh ./script/upgrade-dolphinscheduler.sh
```
