This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 7319535  Automated deployment: Tue Dec  3 08:58:36 UTC 2019 
95f5a6f844c9a062a2d822a8056477ba94a9cf31
7319535 is described below

commit 73195356b3d170543ceb1f8b0660a9902c56da53
Author: lenboo <len...@users.noreply.github.com>
AuthorDate: Tue Dec 3 08:58:36 2019 +0000

    Automated deployment: Tue Dec  3 08:58:36 UTC 2019 
95f5a6f844c9a062a2d822a8056477ba94a9cf31
---
 en-us/docs/user_doc/backend-deployment.html | 27 ++++++++++++++++++-------
 en-us/docs/user_doc/backend-deployment.json |  2 +-
 zh-cn/docs/user_doc/backend-deployment.html | 31 +++++++++++++++++++++--------
 zh-cn/docs/user_doc/backend-deployment.json |  2 +-
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/en-us/docs/user_doc/backend-deployment.html 
b/en-us/docs/user_doc/backend-deployment.html
index 99782fc..9f3f075 100644
--- a/en-us/docs/user_doc/backend-deployment.html
+++ b/en-us/docs/user_doc/backend-deployment.html
@@ -19,10 +19,11 @@
 <li>source code compile and then deployment</li>
 </ul>
 <h2>Preparations</h2>
-<p>Download the latest version of the installation package, download address:  
<a href="https://github.com/apache/incubator-dolphinscheduler/releases";>github 
download</a>, 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)</p>
+<p>Download the latest version of the installation package, download address:  
<a 
href="https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler";>download</a>,
+download 
apache-dolphinscheduler-incubating-x.x.x-dolphinscheduler-backend-bin.tar.gz</p>
 <h4>Preparations 1: Installation of basic software (self-installation of 
required items)</h4>
 <ul>
-<li>Mysql (5.5+) :  Mandatory</li>
+<li>Mysql (5.5+) :  Optional</li>
 <li>JDK (1.8+) :  Mandatory</li>
 <li>ZooKeeper(3.4.6+) :Mandatory</li>
 <li>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)</li>
@@ -62,7 +63,7 @@ flush privileges;
 </li>
 <li>
 <p>creates tables and imports basic data
-Modify the following attributes in ./conf/dao/data_source.properties</p>
+Modify the following attributes in ./conf/application-dao.properties</p>
 <pre><code>    spring.datasource.url
     spring.datasource.username
     spring.datasource.password
@@ -76,8 +77,12 @@ Modify the following attributes in 
./conf/dao/data_source.properties</p>
 <pre><code> instruction of dolphinscheduler-backend directory 
 </code></pre>
 <pre><code class="language-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
@@ -107,7 +112,7 @@ Change the variable to 'true' if you want to use hdfs, you 
also need to create t
 </li>
 </ul>
 <h2>Deployment</h2>
-<p>Automated deployment is recommended, and experienced partners can use 
source deployment as well.</p>
+<p>Either of the following two methods can be deployed,automated deployment is 
recommended, and experienced partners can use source deployment as well.</p>
 <h3>Automated Deployment</h3>
 <ul>
 <li>
@@ -142,12 +147,13 @@ Change the variable to 'true' if you want to use hdfs, 
you also need to create t
 <ul>
 <li>Execute the compilation command:</li>
 </ul>
-<pre><code> mvn -U clean package assembly:assembly -Dmaven.test.skip=true
+<pre><code> mvn -U clean package -Prelease -Dmaven.test.skip=true
 </code></pre>
 <ul>
 <li>View directory</li>
 </ul>
-<p>After normal compilation, ./target/dolphinscheduler-{version}/ is generated 
in the current directory</p>
+<p>After normal compilation, 
<code>apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-backend-bin.tar.gz</code>
+is generated in the 
<code>./dolphinscheduler-dist/dolphinscheduler-backend/target</code> 
directory</p>
 <h3>Start-and-stop services commonly used in systems (for service purposes, 
please refer to System Architecture Design for details)</h3>
 <ul>
 <li>
@@ -190,7 +196,14 @@ sh ./bin/dolphinscheduler-daemon.sh stop logger-server
 sh ./bin/dolphinscheduler-daemon.sh stop alert-server
 </code></pre>
 <h2>Database Upgrade</h2>
-<p>Database upgrade is a function added in version 1.0.2. The database can be 
upgraded automatically by executing the following command:</p>
+<p>Modify the following properties in ./conf/application-dao.properties</p>
+<pre><code>```
+    spring.datasource.url
+    spring.datasource.username
+    spring.datasource.password
+```
+</code></pre>
+<p>The database can be upgraded automatically by executing the following 
command:</p>
 <pre><code class="language-upgrade">sh ./script/upgrade-dolphinscheduler.sh
 </code></pre>
 </div></section><footer class="footer-container"><div class="footer-body"><img 
src="/img/ds_gray.svg"/><div class="cols-container"><div class="col 
col-12"><h3>Disclaimer</h3><p>Apache DolphinScheduler (incubating) is an effort 
undergoing incubation at The Apache Software Foundation (ASF), sponsored by 
Incubator. 
diff --git a/en-us/docs/user_doc/backend-deployment.json 
b/en-us/docs/user_doc/backend-deployment.json
index 7f9134c..73010ee 100644
--- a/en-us/docs/user_doc/backend-deployment.json
+++ b/en-us/docs/user_doc/backend-deployment.json
@@ -1,6 +1,6 @@
 {
   "filename": "backend-deployment.md",
-  "__html": "<h1>Backend Deployment Document</h1>\n<p>There are two deployment 
modes for the backend:</p>\n<ul>\n<li>automatic deployment</li>\n<li>source 
code compile and then 
deployment</li>\n</ul>\n<h2>Preparations</h2>\n<p>Download the latest version 
of the installation package, download address:  <a 
href=\"https://github.com/apache/incubator-dolphinscheduler/releases\";>github 
download</a>, download dolphinscheduler-backend-x.x.x.tar.gz(back-end referred 
to as dolphinscheduler-backen [...]
+  "__html": "<h1>Backend Deployment Document</h1>\n<p>There are two deployment 
modes for the backend:</p>\n<ul>\n<li>automatic deployment</li>\n<li>source 
code compile and then 
deployment</li>\n</ul>\n<h2>Preparations</h2>\n<p>Download the latest version 
of the installation package, download address:  <a 
href=\"https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler\";>download</a>,\ndownload
 
apache-dolphinscheduler-incubating-x.x.x-dolphinscheduler-backend-bin.tar.gz</p>\n<h4>P
 [...]
   "link": "/en-us/docs/user_doc/backend-deployment.html",
   "meta": {}
 }
\ No newline at end of file
diff --git a/zh-cn/docs/user_doc/backend-deployment.html 
b/zh-cn/docs/user_doc/backend-deployment.html
index faf3f1b..0bcff49 100644
--- a/zh-cn/docs/user_doc/backend-deployment.html
+++ b/zh-cn/docs/user_doc/backend-deployment.html
@@ -15,10 +15,10 @@
        <div id="root"><div class="documentation-page" 
data-reactroot=""><header class="header-container header-container-normal"><div 
class="header-body"><a href="/zh-cn/index.html"><img class="logo" 
src="/img/hlogo_colorful.svg"/></a><div class="search search-normal"><span 
class="icon-search"></span></div><span class="language-switch 
language-switch-normal">En</span><div class="header-menu"><img 
class="header-menu-toggle" src="/img/system/menu_gray.png"/><div><ul 
class="ant-menu blackClass an [...]
 <p>后端有2种部署方式,分别为自动化部署和编译源码部署</p>
 <h2>1、准备工作</h2>
-<p>请下载最新版本的安装包,下载地址: <a 
href="https://github.com/apache/incubator-dolphinscheduler/releases";>github下载</a></p>
+<p>请下载最新版本的安装包,下载地址: <a 
href="https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler";>下载</a></p>
 <h4>准备一: 基础软件安装(必装项请自行安装)</h4>
 <ul>
-<li>Mysql (5.5+) :  必装</li>
+<li>Mysql (5.5+) :  选装</li>
 <li><a 
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>
 (1.8+) :  必装</li>
 <li>ZooKeeper (3.4.6+) :必装</li>
 <li>Hadoop (2.6+) :选装, 
如果需要使用到资源上传功能,MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)</li>
@@ -58,7 +58,7 @@ dolphinscheduler  ALL=(ALL)       NOPASSWD: NOPASSWD: ALL
 </li>
 <li>
 <p>创建表和导入基础数据
-修改./conf/dao/data_source.properties中的下列属性</p>
+修改./conf/application-dao.properties中的下列属性</p>
 <pre><code>    spring.datasource.url
     spring.datasource.username
     spring.datasource.password
@@ -73,7 +73,11 @@ dolphinscheduler  ALL=(ALL)       NOPASSWD: NOPASSWD: ALL
 </code></pre>
 <pre><code>bin : 基础服务启动脚本
 conf : 项目配置文件
+DISCLAIMER : DISCLAIMER文件
 lib : 项目依赖jar包,包括各个模块jar和第三方jar
+LICENSE : LICENSE文件
+licenses : 运行时license
+NOTICE : NOTICE文件
 script : 集群启动、停止和服务监控启停脚本
 sql : 项目依赖sql文件
 install.sh : 一键部署脚本
@@ -108,7 +112,7 @@ install.sh : 一键部署脚本
 </li>
 </ul>
 <h2>2、部署</h2>
-<p>推荐自动化部署,有经验的小伙伴也可以使用源码部署</p>
+<p>以下两种方式任选其一部署即可,推荐自动化部署,有经验的小伙伴也可以使用源码部署</p>
 <h3>2.1 自动部署</h3>
 <ul>
 <li>
@@ -143,18 +147,22 @@ install.sh : 一键部署脚本
 <ul>
 <li>执行编译命令:</li>
 </ul>
-<pre><code> mvn -U clean package assembly:assembly -Dmaven.test.skip=true
+<pre><code> mvn -U clean package -Prelease -Dmaven.test.skip=true
 </code></pre>
 <ul>
 <li>查看目录</li>
 </ul>
-<p>正常编译完后,会在当前目录生成 <code>./target/dolphinscheduler-{version}/</code></p>
+<p>正常编译完后,会在 
<code>dolphinscheduler-dist/dolphinscheduler-backend/target</code>目录下生成
+<code>apache-dolphinscheduler-incubating-${latest.release.version}-dolphinscheduler-backend-bin.tar.gz</code></p>
 <pre><code class="language-查看目录"> ../
     ├── bin
     ├── conf
+    |── DISCLAIMER
     |—— install.sh
     |—— lib
-    |—— logs
+    |—— LICENSE
+    |—— licenses
+    |—— NOTICE
     |—— script
     |—— sql
 </code></pre>
@@ -200,7 +208,14 @@ sh ./bin/dolphinscheduler-daemon.sh stop logger-server
 sh ./bin/dolphinscheduler-daemon.sh stop alert-server
 </code></pre>
 <h2>3、数据库升级</h2>
-<p>数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库</p>
+<p>修改./conf/application-dao.properties中的下列属性</p>
+<pre><code>```
+    spring.datasource.url
+    spring.datasource.username
+    spring.datasource.password
+```
+</code></pre>
+<p>执行以下命令即可自动升级数据库</p>
 <pre><code>sh ./script/upgrade-dolphinscheduler.sh
 </code></pre>
 </div></section><footer class="footer-container"><div class="footer-body"><img 
src="/img/ds_gray.svg"/><div class="cols-container"><div class="col 
col-12"><h3>Disclaimer</h3><p>Apache DolphinScheduler (incubating) is an effort 
undergoing incubation at The Apache Software Foundation (ASF), sponsored by 
Incubator. 
diff --git a/zh-cn/docs/user_doc/backend-deployment.json 
b/zh-cn/docs/user_doc/backend-deployment.json
index 463185d..8c7cad3 100644
--- a/zh-cn/docs/user_doc/backend-deployment.json
+++ b/zh-cn/docs/user_doc/backend-deployment.json
@@ -1,6 +1,6 @@
 {
   "filename": "backend-deployment.md",
-  "__html": 
"<h1>后端部署文档</h1>\n<p>后端有2种部署方式,分别为自动化部署和编译源码部署</p>\n<h2>1、准备工作</h2>\n<p>请下载最新版本的安装包,下载地址:
 <a 
href=\"https://github.com/apache/incubator-dolphinscheduler/releases\";>github下载</a></p>\n<h4>准备一:
 基础软件安装(必装项请自行安装)</h4>\n<ul>\n<li>Mysql (5.5+) :  必装</li>\n<li><a 
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>
 (1.8+) :  必装</li>\n<li>ZooKeeper (3.4.6+) :必装</li>\n<li>Hadoop (2.6+) :选装, 
如果需要使用到资源上传功能,MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)</li>\n [...]
+  "__html": 
"<h1>后端部署文档</h1>\n<p>后端有2种部署方式,分别为自动化部署和编译源码部署</p>\n<h2>1、准备工作</h2>\n<p>请下载最新版本的安装包,下载地址:
 <a 
href=\"https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler\";>下载</a></p>\n<h4>准备一:
 基础软件安装(必装项请自行安装)</h4>\n<ul>\n<li>Mysql (5.5+) :  选装</li>\n<li><a 
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>
 (1.8+) :  必装</li>\n<li>ZooKeeper (3.4.6+) :必装</li>\n<li>Hadoop (2.6+) :选装, 
如果需要使用到资源上传功能,MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)</li>\n<l [...]
   "link": "/zh-cn/docs/user_doc/backend-deployment.html",
   "meta": {}
 }
\ No newline at end of file

Reply via email to