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/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 14dcafd52 Automated deployment:
bd5d4b4eadf206439824a437649690f6710ca0d8
14dcafd52 is described below
commit 14dcafd52823008edd67a37045e6e301db4c326d
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed May 25 05:08:40 2022 +0000
Automated deployment: bd5d4b4eadf206439824a437649690f6710ca0d8
---
.../dev/user_doc/architecture/configuration.html | 1 -
.../dev/user_doc/architecture/configuration.json | 2 +-
.../user_doc/guide/installation/kubernetes.html | 99 +++++++++------------
.../user_doc/guide/installation/kubernetes.json | 2 +-
.../guide/installation/pseudo-cluster.html | 2 -
.../guide/installation/pseudo-cluster.json | 2 +-
en-us/docs/dev/user_doc/guide/parameter/local.html | 24 +++--
en-us/docs/dev/user_doc/guide/parameter/local.json | 2 +-
en-us/docs/dev/user_doc/guide/start/docker.html | 14 +--
en-us/docs/dev/user_doc/guide/start/docker.json | 2 +-
en-us/docs/dev/user_doc/guide/task/datax.html | 60 ++++++-------
en-us/docs/dev/user_doc/guide/task/datax.json | 2 +-
en-us/docs/dev/user_doc/guide/upgrade.html | 1 -
en-us/docs/dev/user_doc/guide/upgrade.json | 2 +-
img/new_ui/dev/parameter/local_parameter01.png | Bin 0 -> 642098 bytes
img/new_ui/dev/parameter/local_parameter02.png | Bin 0 -> 303057 bytes
.../dev/user_doc/architecture/configuration.html | 1 -
.../dev/user_doc/architecture/configuration.json | 2 +-
.../user_doc/guide/installation/kubernetes.html | 99 +++++++++------------
.../user_doc/guide/installation/kubernetes.json | 2 +-
.../guide/installation/pseudo-cluster.html | 2 -
.../guide/installation/pseudo-cluster.json | 2 +-
zh-cn/docs/dev/user_doc/guide/parameter/local.html | 24 +++--
zh-cn/docs/dev/user_doc/guide/parameter/local.json | 2 +-
zh-cn/docs/dev/user_doc/guide/start/docker.html | 14 +--
zh-cn/docs/dev/user_doc/guide/start/docker.json | 2 +-
zh-cn/docs/dev/user_doc/guide/task/datax.html | 25 +++---
zh-cn/docs/dev/user_doc/guide/task/datax.json | 2 +-
zh-cn/docs/dev/user_doc/guide/upgrade.html | 1 -
zh-cn/docs/dev/user_doc/guide/upgrade.json | 2 +-
30 files changed, 176 insertions(+), 219 deletions(-)
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.html
b/en-us/docs/dev/user_doc/architecture/configuration.html
index 403919ca0..d3753c87f 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.html
+++ b/en-us/docs/dev/user_doc/architecture/configuration.html
@@ -993,7 +993,6 @@ mainly configuration including <code>JAVA_HOME</code>, mata
database, registry c
<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
-<span class="hljs-built_in">export</span> SPRING_DATASOURCE_DRIVER_CLASS_NAME
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.json
b/en-us/docs/dev/user_doc/architecture/configuration.json
index 04e3fd7e4..a4fb55c45 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.json
+++ b/en-us/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
"link": "/dist/en-us/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
b/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
index 59a156fae..61f17295a 100644
--- a/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
+++ b/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
@@ -270,7 +270,8 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n
test # with test names
<h3>How to Use MySQL as the DolphinScheduler's Database Instead of
PostgreSQL?</h3>
<blockquote>
<p>Because of the commercial license, we cannot directly use the driver of
MySQL.</p>
-<p>If you want to use MySQL, you can build a new image based on the
<code>apache/dolphinscheduler</code> image follow the following
instructions:</p>
+<p>If you want to use MySQL, you can build a new image based on the
<code>apache/dolphinscheduler-<service></code> image follow the following
instructions:</p>
+<p>Since version 3.0.0, dolphinscheduler has been microserviced and the change
of metadata storage requires replacing all services with MySQL driver, which
including dolphinscheduler-tools, dolphinscheduler-master,
dolphinscheduler-worker, dolphinscheduler-api, dolphinscheduler-alert-server</p>
</blockquote>
<ol>
<li>
@@ -280,17 +281,20 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n
test # with test names
<p>Create a new <code>Dockerfile</code> to add MySQL driver:</p>
</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
+# For example
+# FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:<version>
+
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
</code></pre>
<ol start="3">
<li>Build a new docker image including MySQL driver:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:mysql-driver .
+<pre><code>docker build -t
apache/dolphinscheduler-<service>:mysql-driver .
</code></pre>
<ol start="4">
<li>
-<p>Push the docker image <code>apache/dolphinscheduler:mysql-driver</code> to
a docker registry.</p>
+<p>Push the docker image
<code>apache/dolphinscheduler-<service>:mysql-driver</code> to a docker
registry.</p>
</li>
<li>
<p>Modify image <code>repository</code> and update <code>tag</code> to
<code>mysql-driver</code> in <code>values.yaml</code>.</p>
@@ -304,7 +308,6 @@ COPY mysql-connector-java-8.0.16.jar
/opt/dolphinscheduler/lib
</ol>
<pre><code class="language-yaml"><span
class="hljs-attr">externalDatabase:</span>
<span class="hljs-attr">type:</span> <span
class="hljs-string">"mysql"</span>
- <span class="hljs-attr">driver:</span> <span
class="hljs-string">"com.mysql.jdbc.Driver"</span>
<span class="hljs-attr">host:</span> <span
class="hljs-string">"localhost"</span>
<span class="hljs-attr">port:</span> <span
class="hljs-string">"3306"</span>
<span class="hljs-attr">username:</span> <span
class="hljs-string">"root"</span>
@@ -315,81 +318,58 @@ COPY mysql-connector-java-8.0.16.jar
/opt/dolphinscheduler/lib
<ol start="8">
<li>Run a DolphinScheduler release in Kubernetes (See <strong>Install
DolphinScheduler</strong>).</li>
</ol>
-<h3>How to Support MySQL Datasource in <code>Datasource manage</code>?</h3>
+<h3>How to Support MySQL or Oracle Datasource in <code>Datasource
manage</code>?</h3>
<blockquote>
-<p>Because of the commercial license, we cannot directly use the driver of
MySQL.</p>
-<p>If you want to add MySQL datasource, you can build a new image based on the
<code>apache/dolphinscheduler</code> image follow the following
instructions:</p>
+<p>Because of the commercial license, we cannot directly use the driver of
MySQL or Oracle.</p>
+<p>If you want to add MySQL or Oracle datasource, you can build a new image
based on the <code>apache/dolphinscheduler-<service></code> image follow
the following instructions:</p>
+<p>You need to change the two service images including
dolphinscheduler-worker, dolphinscheduler-api.</p>
</blockquote>
<ol>
<li>
-<p>Download the MySQL driver <a
href="https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar";>mysql-connector-java-8.0.16.jar</a>.</p>
+<p>Download the MySQL driver <a
href="https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar";>mysql-connector-java-8.0.16.jar</a>.
+or download the Oracle driver <a
href="https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc8/";>ojdbc8.jar</a>
(such as <code>ojdbc8-19.9.0.0.jar</code>)</p>
</li>
<li>
-<p>Create a new <code>Dockerfile</code> to add MySQL driver:</p>
+<p>Create a new <code>Dockerfile</code> to add MySQL or Oracle driver:</p>
</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
+# For example
+# FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
+
+# If you want to support MySQL Datasource
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
-</code></pre>
-<ol start="3">
-<li>Build a new docker image including MySQL driver:</li>
-</ol>
-<pre><code>docker build -t apache/dolphinscheduler:mysql-driver .
-</code></pre>
-<ol start="4">
-<li>
-<p>Push the docker image <code>apache/dolphinscheduler:mysql-driver</code> to
a docker registry.</p>
-</li>
-<li>
-<p>Modify image <code>repository</code> and update <code>tag</code> to
<code>mysql-driver</code> in <code>values.yaml</code>.</p>
-</li>
-<li>
-<p>Run a DolphinScheduler release in Kubernetes (See <strong>Install
DolphinScheduler</strong>).</p>
-</li>
-<li>
-<p>Add a MySQL datasource in <code>Datasource manage</code>.</p>
-</li>
-</ol>
-<h3>How to Support Oracle Datasource in <code>Datasource manage</code>?</h3>
-<blockquote>
-<p>Because of the commercial license, we cannot directly use the driver of
Oracle.</p>
-<p>If you want to add Oracle datasource, you can build a new image based on
the <code>apache/dolphinscheduler</code> image follow the following
instructions:</p>
-</blockquote>
-<ol>
-<li>
-<p>Download the Oracle driver <a
href="https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc8/";>ojdbc8.jar</a>
(such as <code>ojdbc8-19.9.0.0.jar</code>)</p>
-</li>
-<li>
-<p>Create a new <code>Dockerfile</code> to add Oracle driver:</p>
-</li>
-</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+
+# If you want to support Oracle Datasource
COPY ojdbc8-19.9.0.0.jar /opt/dolphinscheduler/lib
</code></pre>
<ol start="3">
-<li>Build a new docker image including Oracle driver:</li>
+<li>Build a new docker image including MySQL or Oracle driver:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:oracle-driver .
+<pre><code>docker build -t apache/dolphinscheduler-<service>:new-driver .
</code></pre>
<ol start="4">
<li>
-<p>Push the docker image <code>apache/dolphinscheduler:oracle-driver</code> to
a docker registry.</p>
+<p>Push the docker image
<code>apache/dolphinscheduler-<service>:new-driver</code> to a docker
registry.</p>
</li>
<li>
-<p>Modify image <code>repository</code> and update <code>tag</code> to
<code>oracle-driver</code> in <code>values.yaml</code>.</p>
+<p>Modify image <code>repository</code> and update <code>tag</code> to
<code>new-driver</code> in <code>values.yaml</code>.</p>
</li>
<li>
<p>Run a DolphinScheduler release in Kubernetes (See <strong>Install
DolphinScheduler</strong>).</p>
</li>
<li>
-<p>Add an Oracle datasource in <code>Datasource manage</code>.</p>
+<p>Add a MySQL or Oracle datasource in <code>Datasource manage</code>.</p>
</li>
</ol>
<h3>How to Support Python 2 pip and Custom requirements.txt?</h3>
+<blockquote>
+<p>Just change the image of the dolphinscheduler-worker service.</p>
+</blockquote>
<ol>
<li>Create a new <code>Dockerfile</code> to install pip:</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
@@ -397,16 +377,16 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
</code></pre>
<p>The command will install the default <strong>pip 18.1</strong>. If you
upgrade the pip, just add the following command.</p>
-<pre><code> pip install --no-cache-dir -U pip && \
+<pre><code>pip install --no-cache-dir -U pip && \
</code></pre>
<ol start="2">
<li>Build a new docker image including pip:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:pip .
+<pre><code>docker build -t apache/dolphinscheduler-worker:pip .
</code></pre>
<ol start="3">
<li>
-<p>Push the docker image <code>apache/dolphinscheduler:pip</code> to a docker
registry.</p>
+<p>Push the docker image <code>apache/dolphinscheduler-worker:pip</code> to a
docker registry.</p>
</li>
<li>
<p>Modify image <code>repository</code> and update <code>tag</code> to
<code>pip</code> in <code>values.yaml</code>.</p>
@@ -419,25 +399,28 @@ RUN apt-get update && \
</li>
</ol>
<h3>How to Support Python 3?</h3>
+<blockquote>
+<p>Just change the image of the dolphinscheduler-worker service.</p>
+</blockquote>
<ol>
<li>Create a new <code>Dockerfile</code> to install Python 3:</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
</code></pre>
<p>The command will install the default <strong>Python 3.7.3</strong>. If you
also want to install <strong>pip3</strong>, just replace <code>python3</code>
with <code>python3-pip</code> like:</p>
-<pre><code> apt-get install -y --no-install-recommends python3-pip
&& \
+<pre><code>apt-get install -y --no-install-recommends python3-pip && \
</code></pre>
<ol start="2">
<li>Build a new docker image including Python 3:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:python3 .
+<pre><code>docker build -t apache/dolphinscheduler-worker:python3 .
</code></pre>
<ol start="3">
<li>
-<p>Push the docker image <code>apache/dolphinscheduler:python3</code> to a
docker registry.</p>
+<p>Push the docker image <code>apache/dolphinscheduler-worker:python3</code>
to a docker registry.</p>
</li>
<li>
<p>Modify image <code>repository</code> and update <code>tag</code> to
<code>python3</code> in <code>values.yaml</code>.</p>
diff --git a/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
b/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
index e9beec79c..b08b6c2bc 100644
--- a/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
+++ b/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
@@ -1,6 +1,6 @@
{
"filename": "kubernetes.md",
- "__html": "<h1>QuickStart in Kubernetes</h1>\n<p>Kubernetes deployment is
DolphinScheduler deployment in a Kubernetes cluster, which can schedule massive
tasks and can be used in production.</p>\n<p>If you are a new hand and want to
experience DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluste [...]
+ "__html": "<h1>QuickStart in Kubernetes</h1>\n<p>Kubernetes deployment is
DolphinScheduler deployment in a Kubernetes cluster, which can schedule massive
tasks and can be used in production.</p>\n<p>If you are a new hand and want to
experience DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluste [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/installation/kubernetes.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index 9b3f65cc1..d435f84f6 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -107,7 +107,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java}
#</span><span class="bash"> Database related configuration, <span
class="hljs-built_in">set</span> database <span
class="hljs-built_in">type</span>, username and password</span>
export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
-export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
export
SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler"
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
@@ -161,7 +160,6 @@ mysql></span><span class="bash"> CREATE DATABASE
dolphinscheduler DEFAULT CHA
<p>Then, modify <code>./bin/env/dolphinscheduler_env.sh</code> to use mysql,
change {user} and {password} to what you set in the previous step.</p>
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
-export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export
SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false"
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index 61f55fb13..d61d5e926 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
+ "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
"link":
"/dist/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/parameter/local.html
b/en-us/docs/dev/user_doc/guide/parameter/local.html
index 43bf16c8d..63f618fda 100644
--- a/en-us/docs/dev/user_doc/guide/parameter/local.html
+++ b/en-us/docs/dev/user_doc/guide/parameter/local.html
@@ -14,14 +14,22 @@
<h2>Scope</h2>
<p>Parameters configured on the task definition page, the scope of this
parameter is inside this task only. But if you configure according to <a
href="context.md">Refer to Parameter Context</a>, it could pass to downstream
tasks.</p>
<h2>Usage</h2>
-<p>Usage of local parameters is: at the task define page, click the '+' beside
the 'Custom Parameters' and fill in the key and value to save:</p>
-<p align="center">
- <img src="/img/supplement_local_parameter_en.png" width="80%" />
-</p>
-<p align="center">
- <img src="/img/global_parameter_en.png" width="80%" />
-</p>
-<p>If you want to call the <a href="built-in.md">built-in parameter</a> in the
local parameters, fill in thevalue of built-in parameters in
<code>value</code>. As in the above figure, <code>${biz_date}</code> and
<code>${curdate}</code>.</p>
+<p>Usage of local parameters is: at the task define page, click the '+' beside
the 'Custom Parameters' and fill in the key and value to save.</p>
+<h2>Examples</h2>
+<p>This example shows how to use local parameters to print the current date.
Create a Shell task and write a script with the content <code>echo
${dt}</code>. Click <strong>custom parameter</strong> in the configuration bar,
and the configuration is as follows:</p>
+<p><img src="/img/new_ui/dev/parameter/local_parameter01.png"
alt="local-parameter01"></p>
+<p>Parameters:</p>
+<ul>
+<li>dt: indicates the parameter name</li>
+<li>in: IN indicates that local parameters can only be used on the current
node, and OUT indicates that local parameters can be transmitted to the
downstream</li>
+<li>DATE: indicates the DATE of the data type</li>
+<li>$[YYYY-MM-DD] : indicates a built-in parameter derived from a user-defined
format</li>
+</ul>
+<p>Save the workflow and run it. View Shell task's log.</p>
+<p><img src="/img/new_ui/dev/parameter/local_parameter02.png"
alt="local-parameter02"></p>
+<blockquote>
+<p>Note: The local parameter can be used in the workflow of the current task
node. If it is set to OUT, it can be passed to the downstream workflow. Please
refer to: <a href="context.md">Parameter Context</a></p>
+</blockquote>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/parameter/local.json
b/en-us/docs/dev/user_doc/guide/parameter/local.json
index 600956556..39dafd353 100644
--- a/en-us/docs/dev/user_doc/guide/parameter/local.json
+++ b/en-us/docs/dev/user_doc/guide/parameter/local.json
@@ -1,6 +1,6 @@
{
"filename": "local.md",
- "__html": "<h1>Local Parameter</h1>\n<h2>Scope</h2>\n<p>Parameters
configured on the task definition page, the scope of this parameter is inside
this task only. But if you configure according to <a href=\"context.md\">Refer
to Parameter Context</a>, it could pass to downstream
tasks.</p>\n<h2>Usage</h2>\n<p>Usage of local parameters is: at the task define
page, click the '+' beside the 'Custom Parameters' and fill in the key and
value to save:</p>\n<p align=\"center\">\n <img src=\ [...]
+ "__html": "<h1>Local Parameter</h1>\n<h2>Scope</h2>\n<p>Parameters
configured on the task definition page, the scope of this parameter is inside
this task only. But if you configure according to <a href=\"context.md\">Refer
to Parameter Context</a>, it could pass to downstream
tasks.</p>\n<h2>Usage</h2>\n<p>Usage of local parameters is: at the task define
page, click the '+' beside the 'Custom Parameters' and fill in the key and
value to save.</p>\n<h2>Examples</h2>\n<p>This example sh [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/parameter/local.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/start/docker.html
b/en-us/docs/dev/user_doc/guide/start/docker.html
index 7d829e677..3d7bbdb52 100644
--- a/en-us/docs/dev/user_doc/guide/start/docker.html
+++ b/en-us/docs/dev/user_doc/guide/start/docker.html
@@ -78,17 +78,14 @@ container when it up. You could start DolphinScheduler
server separately if you
<span class="hljs-meta">#</span><span class="bash"> Initialize the database,
make sure database <DATABASE> already exists</span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-tools \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- <span class="hljs-comment"># Use "com.mysql.cj.jdbc.driver" if
you use MySQL</span></span>
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
- -e
SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/<DATABASE>"
\
- -e SPRING_DATASOURCE_USERNAME="<USER>" \
- -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
+ -e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/<DATABASE>"</span>
\
+ -e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
+ -e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
--net host \
- apache/dolphinscheduler-tools:"${DOLPHINSCHEDULER_VERSION}"
tools/bin/upgrade-schema.sh
+ apache/dolphinscheduler-tools:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span>
tools/bin/upgrade-schema.sh</span>
<span class="hljs-meta">#</span><span class="bash"> Starting DolphinScheduler
service</span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-master \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
@@ -97,7 +94,6 @@ container when it up. You could start DolphinScheduler server
separately if you
-d apache/dolphinscheduler-master:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span></span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-worker \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
@@ -106,7 +102,6 @@ container when it up. You could start DolphinScheduler
server separately if you
-d apache/dolphinscheduler-worker:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span></span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-api \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
@@ -115,7 +110,6 @@ container when it up. You could start DolphinScheduler
server separately if you
-d apache/dolphinscheduler-api:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span></span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-alert-server \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
diff --git a/en-us/docs/dev/user_doc/guide/start/docker.json
b/en-us/docs/dev/user_doc/guide/start/docker.json
index 8ae2533fe..e0573661a 100644
--- a/en-us/docs/dev/user_doc/guide/start/docker.json
+++ b/en-us/docs/dev/user_doc/guide/start/docker.json
@@ -1,6 +1,6 @@
{
"filename": "docker.md",
- "__html": "<h1>Docker Quick Start</h1>\n<p>There are three ways to start
DolphinScheduler with Docker, <a
href=\"#using-standalone-server-docker-image\">Standalone-server</a> is the way
you\nfind if you just want to start and try DolphinScheduler as a beginner. <a
href=\"#using-docker-compose-to-start-server\">docker-compose</a> is for\nsome
who want to deploy DolphinScheduler in small or event middle scale workflows in
their daily work.\n<a href=\"#using-exists-postgresql-zookeeper\"> [...]
+ "__html": "<h1>Docker Quick Start</h1>\n<p>There are three ways to start
DolphinScheduler with Docker, <a
href=\"#using-standalone-server-docker-image\">Standalone-server</a> is the way
you\nfind if you just want to start and try DolphinScheduler as a beginner. <a
href=\"#using-docker-compose-to-start-server\">docker-compose</a> is for\nsome
who want to deploy DolphinScheduler in small or event middle scale workflows in
their daily work.\n<a href=\"#using-exists-postgresql-zookeeper\"> [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/start/docker.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/task/datax.html
b/en-us/docs/dev/user_doc/guide/task/datax.html
index 707708ddd..11c8f77a9 100644
--- a/en-us/docs/dev/user_doc/guide/task/datax.html
+++ b/en-us/docs/dev/user_doc/guide/task/datax.html
@@ -15,48 +15,48 @@
<p>DataX task type for executing DataX programs. For DataX nodes, the worker
will execute <code>${DATAX_HOME}/bin/datax.py</code> to analyze the input json
file.</p>
<h2>Create Task</h2>
<ul>
-<li>Click <code>Project -> Management-Project -> Name-Workflow
Definition</code>, and click the <code>Create Workflow</code> button to enter
the DAG editing page.</li>
-<li>Drag from the toolbar <img src="/img/tasks/icons/datax.png" width="15"/>
task node to canvas.</li>
+<li>Click Project Management -> Project Name -> Workflow Definition, and
click the "Create Workflow" button to enter the DAG editing page.</li>
+<li>Drag the <img src="/img/tasks/icons/datax.png" width="15"/> from the
toolbar to the drawing board.</li>
</ul>
<h2>Task Parameter</h2>
<ul>
<li><strong>Node name</strong>: The node name in a workflow definition is
unique.</li>
-<li><strong>Run flag</strong>: Identifies whether this node schedules
normally, if it does not need to execute, select the <code>prohibition
execution</code>.</li>
-<li><strong>Descriptive information</strong>: Describe the function of the
node.</li>
-<li><strong>Task priority</strong>: When the number of worker threads is
insufficient, execute in the order of priority from high to low, and tasks with
the same priority will execute in a first-in first-out order.</li>
-<li><strong>Worker grouping</strong>: Assign tasks to the machines of the
worker group to execute. If <code>Default</code> is selected, randomly select a
worker machine for execution.</li>
-<li><strong>Environment Name</strong>: Configure the environment name in which
run the script.</li>
-<li><strong>Times of failed retry attempts</strong>: The number of times the
task failed to resubmit.</li>
-<li><strong>Failed retry interval</strong>: The time interval (unit minute)
for resubmitting the task after a failed task.</li>
-<li><strong>Delayed execution time</strong>: The time (unit minute) that a
task delays in execution.</li>
-<li><strong>Timeout alarm</strong>: Check the timeout alarm and timeout
failure. When the task runs exceed the "timeout", an alarm email will
send and the task execution will fail.</li>
-<li><strong>Custom template</strong>: Customize the content of the DataX
node's JSON profile when the default DataSource provided does not meet the
requirements.</li>
-<li><strong>JSON</strong>: JSON configuration file for DataX
synchronization.</li>
-<li><strong>Custom parameters</strong>: SQL task type, and stored procedure is
a custom parameter order, to set customized parameter type and data type for
the method is the same as the stored procedure task type. The difference is
that the custom parameter of the SQL task type replaces the
<code>${variable}</code> in the SQL statement.</li>
-<li><strong>Data source</strong>: Select the data source to extract data.</li>
-<li><strong>SQL statement</strong>: The SQL statement used to extract data
from the target database, the SQL query column name is automatically parsed
when execute the node, and mapped to the target table to synchronize column
name. When the column names of the source table and the target table are
inconsistent, they can be converted by column alias (as)</li>
+<li><strong>Run flag</strong>: Identifies whether this node can be scheduled
normally, if it does not need to be executed, you can turn on the prohibition
switch.</li>
+<li><strong>Descriptive information</strong>: describe the function of the
node.</li>
+<li><strong>Task priority</strong>: When the number of worker threads is
insufficient, they are executed in order from high to low, and when the
priority is the same, they are executed according to the first-in first-out
principle.</li>
+<li><strong>Worker grouping</strong>: Tasks are assigned to the machines of
the worker group to execute. If Default is selected, a worker machine will be
randomly selected for execution.</li>
+<li><strong>Environment Name</strong>: Configure the environment name in which
to run the script.</li>
+<li><strong>Number of failed retry attempts</strong>: The number of times the
task failed to be resubmitted.</li>
+<li><strong>Failed retry interval</strong>: The time, in cents, interval for
resubmitting the task after a failed task.</li>
+<li><strong>Delayed execution time</strong>: The time, in cents, that a task
is delayed in execution.</li>
+<li><strong>Timeout alarm</strong>: Check the timeout alarm and timeout
failure. When the task exceeds the "timeout period", an alarm email
will be sent and the task execution will fail.</li>
+<li><strong>Custom template</strong>: Custom the content of the DataX node's
json profile when the default data source provided does not meet the required
requirements.</li>
+<li><strong>json</strong>: json configuration file for DataX
synchronization.</li>
+<li><strong>Custom parameters</strong>: SQL task type, and stored procedure is
a custom parameter order to set values for the method. The custom parameter
type and data type are the same as the stored procedure task type. The
difference is that the SQL task type custom parameter will replace the
${variable} in the SQL statement.</li>
+<li><strong>Data source</strong>: Select the data source from which the data
will be extracted.</li>
+<li><strong>sql statement</strong>: the sql statement used to extract data
from the target database, the sql query column name is automatically parsed
when the node is executed, and mapped to the target table synchronization
column name. When the source table and target table column names are
inconsistent, they can be converted by column alias.</li>
<li><strong>Target library</strong>: Select the target library for data
synchronization.</li>
-<li><strong>Pre-SQL</strong>: Pre-SQL executes before the SQL statement
(executed by the target database).</li>
-<li><strong>Post-SQL</strong>: Post-SQL executes after the SQL statement
(executed by the target database).</li>
-<li><strong>Stream limit (number of bytes)</strong>: Limit the number of bytes
for a query.</li>
+<li><strong>Pre-sql</strong>: Pre-sql is executed before the sql statement
(executed by the target library).</li>
+<li><strong>Post-sql</strong>: Post-sql is executed after the sql statement
(executed by the target library).</li>
+<li><strong>Stream limit (number of bytes)</strong>: Limits the number of
bytes in the query.</li>
<li><strong>Limit flow (number of records)</strong>: Limit the number of
records for a query.</li>
-<li><strong>Running memory</strong>: Set the minimum and maximum memory
required, which can be set according to the actual production environment.</li>
-<li><strong>Predecessor task</strong>: Selecting a predecessor task for the
current task, will set the selected predecessor task as upstream of the current
task.</li>
+<li><strong>Running memory</strong>: the minimum and maximum memory required
can be configured to suit the actual production environment.</li>
+<li><strong>Predecessor task</strong>: Selecting a predecessor task for the
current task will set the selected predecessor task as upstream of the current
task.</li>
</ul>
<h2>Task Example</h2>
-<p>This example demonstrates how to import data from Hive into MySQL.</p>
-<h3>Configure the DataX environment in DolphinScheduler</h3>
-<p>If you are using the DataX task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file: <code>bin/env/dolphinscheduler_env.sh</code>.</p>
+<p>This example demonstrates importing data from Hive into MySQL.</p>
+<h3>Configuring the DataX environment in DolphinScheduler</h3>
+<p>If you are using the DataX task type in a production environment, it is
necessary to configure the required environment first. The configuration file
is as follows:
<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>.</p>
<p><img src="/img/tasks/demo/datax_task01.png" alt="datax_task01"></p>
-<p>After finish the environment configuration, need to restart
DolphinScheduler.</p>
-<h3>Configure DataX Task Node</h3>
-<p>As the default DataSource does not contain data read from Hive, require a
custom JSON, refer to: <a
href="https://github.com/alibaba/DataX/blob/master/hdfswriter/doc/hdfswriter.md";>HDFS
Writer</a>. Note: Partition directories exist on the HDFS path, when importing
data in real world situations, partitioning is recommended to be passed as a
parameter, using custom parameters.</p>
-<p>After finish the required JSON file, you can configure the node by
following the steps in the diagram below:</p>
+<p>After the environment has been configured, DolphinScheduler needs to be
restarted.</p>
+<h3>Configuring DataX Task Node</h3>
+<p>As the default data source does not contain data to be read from Hive, a
custom json is required, refer to: <a
href="https://github.com/alibaba/DataX/blob/master/hdfswriter/doc/hdfswriter.md";>HDFS
Writer</a>. Note: Partition directories exist on the HDFS path, when importing
data in real world situations, partitioning is recommended to be passed as a
parameter, using custom parameters.</p>
+<p>After writing the required json file, you can configure the node content by
following the steps in the diagram below.</p>
<p><img src="/img/tasks/demo/datax_task02.png" alt="datax_task02"></p>
-<h3>View Execution Result</h3>
+<h3>View run results</h3>
<p><img src="/img/tasks/demo/datax_task03.png" alt="datax_task03"></p>
<h3>Notice</h3>
-<p>If the default DataSource provided does not meet your needs, you can
configure the writer and reader of the DataX according to the actual usage
environment in the custom template options, available at <a
href="https://github.com/alibaba/DataX";>DataX</a>.</p>
+<p>If the default data source provided does not meet your needs, you can
configure the writer and reader of DataX according to the actual usage
environment in the custom template option, available at <a
href="https://github.com/alibaba/DataX";>https://github.com/alibaba/DataX</a>.</p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/task/datax.json
b/en-us/docs/dev/user_doc/guide/task/datax.json
index 1d31b0283..eece48440 100644
--- a/en-us/docs/dev/user_doc/guide/task/datax.json
+++ b/en-us/docs/dev/user_doc/guide/task/datax.json
@@ -1,6 +1,6 @@
{
"filename": "datax.md",
- "__html": "<h1>DataX</h1>\n<h2>Overview</h2>\n<p>DataX task type for
executing DataX programs. For DataX nodes, the worker will execute
<code>${DATAX_HOME}/bin/datax.py</code> to analyze the input json
file.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click <code>Project ->
Management-Project -> Name-Workflow Definition</code>, and click the
<code>Create Workflow</code> button to enter the DAG editing
page.</li>\n<li>Drag from the toolbar <img src=\"/img/tasks/icons/datax.png\"
width=\" [...]
+ "__html": "<h1>DataX</h1>\n<h2>Overview</h2>\n<p>DataX task type for
executing DataX programs. For DataX nodes, the worker will execute
<code>${DATAX_HOME}/bin/datax.py</code> to analyze the input json
file.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click Project Management ->
Project Name -> Workflow Definition, and click the "Create
Workflow" button to enter the DAG editing page.</li>\n<li>Drag the <img
src=\"/img/tasks/icons/datax.png\" width=\"15\"/> from the toolbar to [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/task/datax.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/upgrade.html
b/en-us/docs/dev/user_doc/guide/upgrade.html
index 235f4ee96..0cc90a518 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.html
+++ b/en-us/docs/dev/user_doc/guide/upgrade.html
@@ -25,7 +25,6 @@
<p>If using MySQL as the database to run DolphinScheduler, please config it in
<code>./bin/env/dolphinscheduler_env.sh</code>, change username and password to
yours, and add MYSQL connector jar into lib dir <code>./tools/libs</code>, here
we download <code>mysql-connector-java-8.0.16.jar</code>, and then correctly
configure database connection information. You can download MYSQL connector jar
from <a href="https://downloads.MySQL.com/archives/c-j/";>here</a>. Otherwise,
PostgreSQL is the [...]
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
-export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export
SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
diff --git a/en-us/docs/dev/user_doc/guide/upgrade.json
b/en-us/docs/dev/user_doc/guide/upgrade.json
index 5eefc4b69..fbe4da65d 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.json
+++ b/en-us/docs/dev/user_doc/guide/upgrade.json
@@ -1,6 +1,6 @@
{
"filename": "upgrade.md",
- "__html": "<h1>DolphinScheduler Upgrade Documentation</h1>\n<h2>Back-Up
Previous Version's Files and Database</h2>\n<h2>Stop All Services of
DolphinScheduler</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>Download the Latest Version Installation
Package</h2>\n<ul>\n<li><a href=\"/en-us/download/download.html\">download</a>
the latest version of the installation packages.</li>\n<li>The following
upgrade operations need to be performed in the new version's
directory.</li>\n</ul>\ [...]
+ "__html": "<h1>DolphinScheduler Upgrade Documentation</h1>\n<h2>Back-Up
Previous Version's Files and Database</h2>\n<h2>Stop All Services of
DolphinScheduler</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>Download the Latest Version Installation
Package</h2>\n<ul>\n<li><a href=\"/en-us/download/download.html\">download</a>
the latest version of the installation packages.</li>\n<li>The following
upgrade operations need to be performed in the new version's
directory.</li>\n</ul>\ [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/upgrade.html",
"meta": {}
}
\ No newline at end of file
diff --git a/img/new_ui/dev/parameter/local_parameter01.png
b/img/new_ui/dev/parameter/local_parameter01.png
new file mode 100644
index 000000000..09d38366e
Binary files /dev/null and b/img/new_ui/dev/parameter/local_parameter01.png
differ
diff --git a/img/new_ui/dev/parameter/local_parameter02.png
b/img/new_ui/dev/parameter/local_parameter02.png
new file mode 100644
index 000000000..02572a703
Binary files /dev/null and b/img/new_ui/dev/parameter/local_parameter02.png
differ
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.html
b/zh-cn/docs/dev/user_doc/architecture/configuration.html
index 52715a3df..e1fa3fb81 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.html
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.html
@@ -988,7 +988,6 @@ apiServers=<span class="hljs-string">"ds1"</span>
<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
-<span class="hljs-built_in">export</span> SPRING_DATASOURCE_DRIVER_CLASS_NAME
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.json
b/zh-cn/docs/dev/user_doc/architecture/configuration.json
index 413661147..593eaadbe 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.json
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>├── LICENSE\n│\n├── NOTICE\n│\n├──
licenses licenses存放目录\n│\n├── bin
[...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>├── LICENSE\n│\n├── NOTICE\n│\n├──
licenses licenses存放目录\n│\n├── bin
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
index c8ce023ed..a3b6dd453 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
@@ -270,7 +270,8 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n
test # with test names
<h3>如何用 MySQL 替代 PostgreSQL 作为 DolphinScheduler 的数据库？</h3>
<blockquote>
<p>由于商业许可证的原因，我们不能直接使用 MySQL 的驱动包.</p>
-<p>如果你要使用 MySQL, 你可以基于官方镜像 <code>apache/dolphinscheduler</code> 进行构建.</p>
+<p>如果你要使用 MySQL, 你可以基于官方镜像
<code>apache/dolphinscheduler-<service></code> 进行构建.</p>
+<p>从3.0.0版本起，dolphinscheduler已经微服务化，更改元数据存储需要对把所有的服务都替换为 MySQL 驱动包，包括
dolphinscheduler-tools, dolphinscheduler-master, dolphinscheduler-worker,
dolphinscheduler-api, dolphinscheduler-alert-server .</p>
</blockquote>
<ol>
<li>
@@ -280,17 +281,20 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n
test # with test names
<p>创建一个新的 <code>Dockerfile</code>，用于添加 MySQL 的驱动包:</p>
</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
+# For example
+# FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:<version>
+
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
</code></pre>
<ol start="3">
<li>构建一个包含 MySQL 驱动包的新镜像:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:mysql-driver .
+<pre><code>docker build -t
apache/dolphinscheduler-<service>:mysql-driver .
</code></pre>
<ol start="4">
<li>
-<p>推送 docker 镜像 <code>apache/dolphinscheduler:mysql-driver</code> 到一个 docker
registry 中</p>
+<p>推送 docker 镜像
<code>apache/dolphinscheduler-<service>:mysql-driver</code> 到一个 docker
registry 中</p>
</li>
<li>
<p>修改 <code>values.yaml</code> 文件中 image 的 <code>repository</code> 字段，并更新
<code>tag</code> 为 <code>mysql-driver</code></p>
@@ -304,7 +308,6 @@ COPY mysql-connector-java-8.0.16.jar
/opt/dolphinscheduler/lib
</ol>
<pre><code class="language-yaml"><span
class="hljs-attr">externalDatabase:</span>
<span class="hljs-attr">type:</span> <span
class="hljs-string">"mysql"</span>
- <span class="hljs-attr">driver:</span> <span
class="hljs-string">"com.mysql.jdbc.Driver"</span>
<span class="hljs-attr">host:</span> <span
class="hljs-string">"localhost"</span>
<span class="hljs-attr">port:</span> <span
class="hljs-string">"3306"</span>
<span class="hljs-attr">username:</span> <span
class="hljs-string">"root"</span>
@@ -315,81 +318,58 @@ COPY mysql-connector-java-8.0.16.jar
/opt/dolphinscheduler/lib
<ol start="8">
<li>部署 dolphinscheduler (详见<strong>安装 dolphinscheduler</strong>)</li>
</ol>
-<h3>如何在数据源中心支持 MySQL 数据源？</h3>
+<h3>如何在数据源中心支持 MySQL 或者 Oracle 数据源？</h3>
<blockquote>
-<p>由于商业许可证的原因，我们不能直接使用 MySQL 的驱动包.</p>
-<p>如果你要添加 MySQL 数据源, 你可以基于官方镜像 <code>apache/dolphinscheduler</code> 进行构建.</p>
+<p>由于商业许可证的原因，我们不能直接使用 MySQL 或者 Oracle 的驱动包.</p>
+<p>如果你要添加 MySQL 或者 Oracle, 你可以基于官方镜像
<code>apache/dolphinscheduler-<service></code> 进行构建.</p>
+<p>需要更改 dolphinscheduler-worker, dolphinscheduler-api 两个服务的镜像.</p>
</blockquote>
<ol>
<li>
-<p>下载 MySQL 驱动包 <a
href="https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar";>mysql-connector-java-8.0.16.jar</a></p>
+<p>下载 MySQL 驱动包 <a
href="https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar";>mysql-connector-java-8.0.16.jar</a>
+或者 Oracle 驱动包 <a
href="https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc8/";>ojdbc8.jar</a>
(例如 <code>ojdbc8-19.9.0.0.jar</code>)</p>
</li>
<li>
-<p>创建一个新的 <code>Dockerfile</code>，用于添加 MySQL 驱动包:</p>
+<p>创建一个新的 <code>Dockerfile</code>，用于添加 MySQL 或者 Oracle 驱动包:</p>
</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
+# For example
+# FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
+
+# If you want to support MySQL Datasource
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
-</code></pre>
-<ol start="3">
-<li>构建一个包含 MySQL 驱动包的新镜像:</li>
-</ol>
-<pre><code>docker build -t apache/dolphinscheduler:mysql-driver .
-</code></pre>
-<ol start="4">
-<li>
-<p>推送 docker 镜像 <code>apache/dolphinscheduler:mysql-driver</code> 到一个 docker
registry 中</p>
-</li>
-<li>
-<p>修改 <code>values.yaml</code> 文件中 image 的 <code>repository</code> 字段，并更新
<code>tag</code> 为 <code>mysql-driver</code></p>
-</li>
-<li>
-<p>部署 dolphinscheduler (详见<strong>安装 dolphinscheduler</strong>)</p>
-</li>
-<li>
-<p>在数据源中心添加一个 MySQL 数据源</p>
-</li>
-</ol>
-<h3>如何在数据源中心支持 Oracle 数据源？</h3>
-<blockquote>
-<p>由于商业许可证的原因，我们不能直接使用 Oracle 的驱动包.</p>
-<p>如果你要添加 Oracle 数据源, 你可以基于官方镜像 <code>apache/dolphinscheduler</code> 进行构建.</p>
-</blockquote>
-<ol>
-<li>
-<p>下载 Oracle 驱动包 <a
href="https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc8/";>ojdbc8.jar</a>
(例如 <code>ojdbc8-19.9.0.0.jar</code>)</p>
-</li>
-<li>
-<p>创建一个新的 <code>Dockerfile</code>，用于添加 Oracle 驱动包:</p>
-</li>
-</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+
+# If you want to support Oracle Datasource
COPY ojdbc8-19.9.0.0.jar /opt/dolphinscheduler/lib
</code></pre>
<ol start="3">
-<li>构建一个包含 Oracle 驱动包的新镜像:</li>
+<li>构建一个包含 MySQL 或者 Oracle 驱动包的新镜像:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:oracle-driver .
+<pre><code>docker build -t apache/dolphinscheduler-<service>:new-driver .
</code></pre>
<ol start="4">
<li>
-<p>推送 docker 镜像 <code>apache/dolphinscheduler:oracle-driver</code> 到一个 docker
registry 中</p>
+<p>推送 docker 镜像
<code>apache/dolphinscheduler-<service>:new-driver</code> 到一个 docker
registry 中</p>
</li>
<li>
-<p>修改 <code>values.yaml</code> 文件中 image 的 <code>repository</code> 字段，并更新
<code>tag</code> 为 <code>oracle-driver</code></p>
+<p>修改 <code>values.yaml</code> 文件中 image 的 <code>repository</code> 字段，并更新
<code>tag</code> 为 <code>new-driver</code></p>
</li>
<li>
<p>部署 dolphinscheduler (详见<strong>安装 dolphinscheduler</strong>)</p>
</li>
<li>
-<p>在数据源中心添加一个 Oracle 数据源</p>
+<p>在数据源中心添加一个 MySQL 或者 Oracle 数据源</p>
</li>
</ol>
<h3>如何支持 Python 2 pip 以及自定义 requirements.txt？</h3>
+<blockquote>
+<p>只需要更改 dolphinscheduler-worker 服务的镜像.</p>
+</blockquote>
<ol>
<li>创建一个新的 <code>Dockerfile</code>，用于安装 pip:</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
@@ -397,16 +377,16 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
</code></pre>
<p>这个命令会安装默认的 <strong>pip 18.1</strong>. 如果你想升级 pip, 只需添加一行</p>
-<pre><code> pip install --no-cache-dir -U pip && \
+<pre><code>pip install --no-cache-dir -U pip && \
</code></pre>
<ol start="2">
<li>构建一个包含 pip 的新镜像:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:pip .
+<pre><code>docker build -t apache/dolphinscheduler-worker:pip .
</code></pre>
<ol start="3">
<li>
-<p>推送 docker 镜像 <code>apache/dolphinscheduler:pip</code> 到一个 docker registry
中</p>
+<p>推送 docker 镜像 <code>apache/dolphinscheduler-worker:pip</code> 到一个 docker
registry 中</p>
</li>
<li>
<p>修改 <code>values.yaml</code> 文件中 image 的 <code>repository</code> 字段，并更新
<code>tag</code> 为 <code>pip</code></p>
@@ -419,25 +399,28 @@ RUN apt-get update && \
</li>
</ol>
<h3>如何支持 Python 3？</h3>
+<blockquote>
+<p>只需要更改 dolphinscheduler-worker 服务的镜像.</p>
+</blockquote>
<ol>
<li>创建一个新的 <code>Dockerfile</code>，用于安装 Python 3:</li>
</ol>
-<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+<pre><code>FROM
dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
</code></pre>
<p>这个命令会安装默认的 <strong>Python 3.7.3</strong>. 如果你也想安装 <strong>pip3</strong>, 将
<code>python3</code> 替换为 <code>python3-pip</code> 即可</p>
-<pre><code> apt-get install -y --no-install-recommends python3-pip
&& \
+<pre><code>apt-get install -y --no-install-recommends python3-pip && \
</code></pre>
<ol start="2">
<li>构建一个包含 Python 3 的新镜像:</li>
</ol>
-<pre><code>docker build -t apache/dolphinscheduler:python3 .
+<pre><code>docker build -t apache/dolphinscheduler-worker:python3 .
</code></pre>
<ol start="3">
<li>
-<p>推送 docker 镜像 <code>apache/dolphinscheduler:python3</code> 到一个 docker
registry 中</p>
+<p>推送 docker 镜像 <code>apache/dolphinscheduler-worker:python3</code> 到一个 docker
registry 中</p>
</li>
<li>
<p>修改 <code>values.yaml</code> 文件中 image 的 <code>repository</code> 字段，并更新
<code>tag</code> 为 <code>python3</code></p>
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
index 7ca02317f..7a8d3fcbc 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
@@ -1,6 +1,6 @@
{
"filename": "kubernetes.md",
- "__html": "<h1>快速试用 Kubernetes 部署</h1>\n<p>Kubernetes部署目的是在Kubernetes集群中部署
DolphinScheduler 服务，能调度大量任务，可用于在生产中部署。</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>先决条件</h2>\n<ul>\n<li><a
href=\"https://helm.sh/\";>Helm</a> 3.1.0+</li>\n<li><a
href=\"https://kubernetes.io/\";>Kubernetes< [...]
+ "__html": "<h1>快速试用 Kubernetes 部署</h1>\n<p>Kubernetes部署目的是在Kubernetes集群中部署
DolphinScheduler 服务，能调度大量任务，可用于在生产中部署。</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>先决条件</h2>\n<ul>\n<li><a
href=\"https://helm.sh/\";>Helm</a> 3.1.0+</li>\n<li><a
href=\"https://kubernetes.io/\";>Kubernetes< [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index d8a9c728a..8a200a230 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -104,7 +104,6 @@ deployUser="dolphinscheduler"
<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
-<span class="hljs-built_in">export</span>
SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://127.0.0.1:5432/dolphinscheduler"</span>
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME={user}
<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD={password}
@@ -158,7 +157,6 @@ mysql></span><span class="bash"> CREATE DATABASE
dolphinscheduler DEFAULT CHA
<p>然后修改<code>./bin/env/dolphinscheduler_env.sh</code>，将username和password改成你在上一步中设置的用户名{user}和密码{password}</p>
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
-export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export
SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false"
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index df370fde0..220bf6894 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
+ "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
"link":
"/dist/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/parameter/local.html
b/zh-cn/docs/dev/user_doc/guide/parameter/local.html
index 0b480e9c1..c15ea73fd 100644
--- a/zh-cn/docs/dev/user_doc/guide/parameter/local.html
+++ b/zh-cn/docs/dev/user_doc/guide/parameter/local.html
@@ -14,14 +14,22 @@
<h2>作用域</h2>
<p>在任务定义页面配置的参数，默认作用域仅限该任务，如果配置了<a
href="context.md">参数传递</a>则可将该参数作用到下游任务中。</p>
<h2>使用方式</h2>
-<p>本地参数配置方式如下：在任务定义页面，点击“自定义参数”右边的加号，填写对应的变量名称和对应的值，保存即可</p>
-<p align="center">
- <img src="/img/supplement_local_parameter.png" width="80%" />
- </p>
-<p align="center">
- <img src="/img/global_parameter.png" width="80%" />
-</p>
-<p>如果想要在本地参数中调用系统内置参数，将内置参数对应的值填到<code>value</code>中，如上图中的<code>${biz_date}</code>以及<code>${curdate}</code></p>
+<p>本地参数配置方式如下：在任务定义页面，点击“自定义参数”右边的加号，填写对应的变量名称和对应的值，保存即可。</p>
+<h2>任务样例</h2>
+<p>本样例展示了如何使用本地参数，打印输出当前日期。创建一个 Shell 任务，并编写脚本内容为 <code>echo
${dt}</code>。点击配置栏中的<strong>自定义参数</strong>，配置如下图所示：</p>
+<p><img src="/img/new_ui/dev/parameter/local_parameter01.png"
alt="local-parameter01"></p>
+<p>参数说明：</p>
+<ul>
+<li>dt：参数名</li>
+<li>IN：IN 表示局部参数仅能在当前节点使用，OUT 表示局部参数可以向下游传递</li>
+<li>DATE：数据类型，日期</li>
+<li>$[yyyy-MM-dd]：自定义格式的衍生内置参数</li>
+</ul>
+<p>保存工作流并运行，查看 Shell 任务输出日志。</p>
+<p><img src="/img/new_ui/dev/parameter/local_parameter02.png"
alt="local-parameter02"></p>
+<blockquote>
+<p>注：本地参数可以在当前任务节点的工作流中，设置其为 OUT 则可以传递给下游的工作流使用，可以参考：<a
href="context.md">参数传递</a></p>
+</blockquote>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈？请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/parameter/local.json
b/zh-cn/docs/dev/user_doc/guide/parameter/local.json
index 6ee51f45b..c2f781a86 100644
--- a/zh-cn/docs/dev/user_doc/guide/parameter/local.json
+++ b/zh-cn/docs/dev/user_doc/guide/parameter/local.json
@@ -1,6 +1,6 @@
{
"filename": "local.md",
- "__html": "<h1>本地参数</h1>\n<h2>作用域</h2>\n<p>在任务定义页面配置的参数，默认作用域仅限该任务，如果配置了<a
href=\"context.md\">参数传递</a>则可将该参数作用到下游任务中。</p>\n<h2>使用方式</h2>\n<p>本地参数配置方式如下：在任务定义页面，点击“自定义参数”右边的加号，填写对应的变量名称和对应的值，保存即可</p>\n<p
align=\"center\">\n <img src=\"/img/supplement_local_parameter.png\"
width=\"80%\" />\n </p>\n<p align=\"center\">\n <img
src=\"/img/global_parameter.png\" width=\"80%\"
/>\n</p>\n<p>如果想要在本地参数中调用系统内置参数，将内置参数对应的值填到<code>value</code>中，如上图中的<code>${biz_date}</code>以及<code>${curdate}</
[...]
+ "__html": "<h1>本地参数</h1>\n<h2>作用域</h2>\n<p>在任务定义页面配置的参数，默认作用域仅限该任务，如果配置了<a
href=\"context.md\">参数传递</a>则可将该参数作用到下游任务中。</p>\n<h2>使用方式</h2>\n<p>本地参数配置方式如下：在任务定义页面，点击“自定义参数”右边的加号，填写对应的变量名称和对应的值，保存即可。</p>\n<h2>任务样例</h2>\n<p>本样例展示了如何使用本地参数，打印输出当前日期。创建一个
Shell 任务，并编写脚本内容为 <code>echo
${dt}</code>。点击配置栏中的<strong>自定义参数</strong>，配置如下图所示：</p>\n<p><img
src=\"/img/new_ui/dev/parameter/local_parameter01.png\"
alt=\"local-parameter01\"></p>\n<p>参数说明：</p>\n<ul>\n<li>dt：参数名</li>\n<li>IN：IN
表示局部参数仅能在当前节 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/parameter/local.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/start/docker.html
b/zh-cn/docs/dev/user_doc/guide/start/docker.html
index 10b5db786..f3fe5fb1c 100644
--- a/zh-cn/docs/dev/user_doc/guide/start/docker.html
+++ b/zh-cn/docs/dev/user_doc/guide/start/docker.html
@@ -71,17 +71,14 @@ ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 Dol
<span class="hljs-meta">#</span><span class="bash"> 初始化数据库，其确保数据库
<DATABASE> 已经存在</span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-tools \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- <span class="hljs-comment"># 如果使用 MySQL 则使用
"com.mysql.cj.jdbc.driver"</span></span>
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
- -e
SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/<DATABASE>"
\
- -e SPRING_DATASOURCE_USERNAME="<USER>" \
- -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
+ -e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/<DATABASE>"</span>
\
+ -e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
+ -e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
--net host \
- apache/dolphinscheduler-tools:"${DOLPHINSCHEDULER_VERSION}"
tools/bin/upgrade-schema.sh
+ apache/dolphinscheduler-tools:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span>
tools/bin/upgrade-schema.sh</span>
<span class="hljs-meta">#</span><span class="bash"> 启动 DolphinScheduler
对应的服务</span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-master \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
@@ -90,7 +87,6 @@ ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 Dol
-d apache/dolphinscheduler-master:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span></span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-worker \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
@@ -99,7 +95,6 @@ ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 Dol
-d apache/dolphinscheduler-worker:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span></span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-api \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
@@ -108,7 +103,6 @@ ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 Dol
-d apache/dolphinscheduler-api:<span class="hljs-string">"<span
class="hljs-variable">${DOLPHINSCHEDULER_VERSION}</span>"</span></span>
<span class="hljs-meta">$</span><span class="bash"> docker run -d --name
dolphinscheduler-alert-server \
-e DATABASE=<span class="hljs-string">"postgresql"</span> \
- -e SPRING_DATASOURCE_DRIVER_CLASS_NAME=<span
class="hljs-string">"org.postgresql.Driver"</span> \
-e SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://localhost:5432/dolphinscheduler"</span>
\
-e SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"<USER>"</span> \
-e SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"<PASSWORD>"</span> \
diff --git a/zh-cn/docs/dev/user_doc/guide/start/docker.json
b/zh-cn/docs/dev/user_doc/guide/start/docker.json
index fef8bbec8..71aa39371 100644
--- a/zh-cn/docs/dev/user_doc/guide/start/docker.json
+++ b/zh-cn/docs/dev/user_doc/guide/start/docker.json
@@ -1,6 +1,6 @@
{
"filename": "docker.md",
- "__html": "<h1>Docker 快速使用教程</h1>\n<p>本教程使用三种不同的方式通过 Docker 完成
DolphinScheduler 的部署，如果你想要快速体验，推荐使用 standalone-server 镜像，\n如果你想要体验比较完成的服务，推荐使用
docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务\n你想要沿用这些基础服务，你可以参考沿用已有的
PostgreSQL 和 ZooKeeper 服务完成部署。</p>\n<h2>前置条件</h2>\n<ul>\n<li><a
href=\"https://docs.docker.com/engine/install/\";>Docker</a>
1.13.1+</li>\n<li><a href=\"https://docs.docker.com/compose/\";>Docker
Compose</a> 1.28.0+</li>\n</ul>\n<h2>启动服务</h2>\n<h3>使用 standalone-server
镜像</h3>\n [...]
+ "__html": "<h1>Docker 快速使用教程</h1>\n<p>本教程使用三种不同的方式通过 Docker 完成
DolphinScheduler 的部署，如果你想要快速体验，推荐使用 standalone-server 镜像，\n如果你想要体验比较完成的服务，推荐使用
docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务\n你想要沿用这些基础服务，你可以参考沿用已有的
PostgreSQL 和 ZooKeeper 服务完成部署。</p>\n<h2>前置条件</h2>\n<ul>\n<li><a
href=\"https://docs.docker.com/engine/install/\";>Docker</a>
1.13.1+</li>\n<li><a href=\"https://docs.docker.com/compose/\";>Docker
Compose</a> 1.28.0+</li>\n</ul>\n<h2>启动服务</h2>\n<h3>使用 standalone-server
镜像</h3>\n [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/start/docker.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/task/datax.html
b/zh-cn/docs/dev/user_doc/guide/task/datax.html
index e92348010..d46817466 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/datax.html
+++ b/zh-cn/docs/dev/user_doc/guide/task/datax.html
@@ -46,22 +46,17 @@
<h2>任务样例</h2>
<p>该样例演示为从 Hive 数据导入到 MySQL 中。</p>
<h3>在 DolphinScheduler 中配置 DataX 环境</h3>
-<p>若生产环境中要是使用到 DataX
任务类型，则需要先配置好所需的环境。配置文件如下：<code>bin/env/dolphinscheduler_env.sh</code>。</p>
+<p>若生产环境中要是使用到 DataX
任务类型，则需要先配置好所需的环境。配置文件如下：<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>。</p>
<p><img src="/img/tasks/demo/datax_task01.png" alt="datax_task01"></p>
- <p align="center">
- <img src="/img/datax_edit.png" width="80%" />
- </p>
-<ul>
-<li>自定义模板：打开自定义模板开关时，可以自定义datax节点的json配置文件内容（适用于控件配置不满足需求时）</li>
-<li>数据源：选择抽取数据的数据源</li>
-<li>sql语句：目标库抽取数据的sql语句，节点执行时自动解析sql查询列名，映射为目标表同步列名，源表和目标表列名不一致时，可以通过列别名（as）转换</li>
-<li>目标库：选择数据同步的目标库</li>
-<li>目标表：数据同步的目标表名</li>
-<li>前置sql:前置sql在sql语句之前执行（目标库执行）。</li>
-<li>后置sql:后置sql在sql语句之后执行（目标库执行）。</li>
-<li>json：datax同步的json配置文件</li>
-<li>自定义参数：SQL任务类型，而存储过程是自定义参数顺序的给方法设置值自定义参数类型和数据类型同存储过程任务类型一样。区别在于SQL任务类型自定义参数会替换sql语句中${变量}。</li>
-</ul>
+<p>当环境配置完成之后，需要重启 DolphinScheduler。</p>
+<h3>配置 DataX 任务节点</h3>
+<p>由于默认的的数据源中并不包含从 Hive 中读取数据，所以需要自定义 json，可参考：<a
href="https://github.com/alibaba/DataX/blob/master/hdfswriter/doc/hdfswriter.md";>HDFS
Writer</a>。其中需要注意的是 HDFS 路径上存在分区目录，在实际情况导入数据时，分区建议进行传参，即使用自定义参数。</p>
+<p>在编写好所需的 json 之后，可按照下图步骤进行配置节点内容。</p>
+<p><img src="/img/tasks/demo/datax_task02.png" alt="datax_task02"></p>
+<h3>查看运行结果</h3>
+<p><img src="/img/tasks/demo/datax_task03.png" alt="datax_task03"></p>
+<h2>注意事项：</h2>
+<p>若默认提供的数据源不满足需求，可在自定义模板选项中，根据实际使用环境来配置 DataX 的 writer 和 reader，可参考：<a
href="https://github.com/alibaba/DataX";>https://github.com/alibaba/DataX</a></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈？请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/task/datax.json
b/zh-cn/docs/dev/user_doc/guide/task/datax.json
index 3aa4f7bf2..4619ca34d 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/datax.json
+++ b/zh-cn/docs/dev/user_doc/guide/task/datax.json
@@ -1,6 +1,6 @@
{
"filename": "datax.md",
- "__html": "<h1>DATAX 节点</h1>\n<h2>综述</h2>\n<p>DataX 任务类型，用于执行 DataX 程序。对于
DataX 节点，worker 会通过执行 <code>${DATAX_HOME}/bin/datax.py</code> 来解析传入的 json
文件。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理 -> 项目名称 -> 工作流定义，点击“创建工作流”按钮，进入
DAG 编辑页面；</li>\n<li>拖动工具栏的<img src=\"/img/tasks/icons/datax.png\"
width=\"15\"/>
任务节点到画板中。</li>\n</ul>\n<h2>任务参数</h2>\n<ul>\n<li>节点名称：设置任务节点的名称。一个工作流定义中的节点名称是唯一的。</li>\n<li>运行标志：标识这个结点是否能正常调度，如果不需要执行，可以打开禁止执行开关。</li>\n<li>描述：描述该节点的功能。</li>\n<li>任务优先级：worker
线程数不足 [...]
+ "__html": "<h1>DATAX 节点</h1>\n<h2>综述</h2>\n<p>DataX 任务类型，用于执行 DataX 程序。对于
DataX 节点，worker 会通过执行 <code>${DATAX_HOME}/bin/datax.py</code> 来解析传入的 json
文件。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理 -> 项目名称 -> 工作流定义，点击“创建工作流”按钮，进入
DAG 编辑页面；</li>\n<li>拖动工具栏的<img src=\"/img/tasks/icons/datax.png\"
width=\"15\"/>
任务节点到画板中。</li>\n</ul>\n<h2>任务参数</h2>\n<ul>\n<li>节点名称：设置任务节点的名称。一个工作流定义中的节点名称是唯一的。</li>\n<li>运行标志：标识这个结点是否能正常调度，如果不需要执行，可以打开禁止执行开关。</li>\n<li>描述：描述该节点的功能。</li>\n<li>任务优先级：worker
线程数不足 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/task/datax.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/upgrade.html
b/zh-cn/docs/dev/user_doc/guide/upgrade.html
index 9fd8870fd..44551a6ab 100644
--- a/zh-cn/docs/dev/user_doc/guide/upgrade.html
+++ b/zh-cn/docs/dev/user_doc/guide/upgrade.html
@@ -25,7 +25,6 @@
<p>如果选择
MySQL，请修改<code>./bin/env/dolphinscheduler_env.sh</code>中的如下配置（{user}和{password}改成你数据库的用户名和密码）,
还需要手动添加 <a href="https://downloads.MySQL.com/archives/c-j/";>
mysql-connector-java 驱动 jar </a> 包到 lib
目录（<code>./tools/lib</code>）下，这里下载的是mysql-connector-java-8.0.16.jar</p>
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
-export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export
SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
diff --git a/zh-cn/docs/dev/user_doc/guide/upgrade.json
b/zh-cn/docs/dev/user_doc/guide/upgrade.json
index bdc4c2211..6deaeb4a6 100644
--- a/zh-cn/docs/dev/user_doc/guide/upgrade.json
+++ b/zh-cn/docs/dev/user_doc/guide/upgrade.json
@@ -1,6 +1,6 @@
{
"filename": "upgrade.md",
- "__html": "<h1>DolphinScheduler升级文档</h1>\n<h2>1. 备份上一版本文件和数据库</h2>\n<h2>2.
停止dolphinscheduler所有服务</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>3. 下载新版本的安装包</h2>\n<ul>\n<li><a
href=\"/zh-cn/download/download.html\">下载</a>,
下载最新版本的二进制安装包</li>\n<li>以下升级操作都需要在新版本的目录进行</li>\n</ul>\n<h2>4.
数据库升级</h2>\n<ul>\n<li>\n<p>如果选择
MySQL，请修改<code>./bin/env/dolphinscheduler_env.sh</code>中的如下配置（{user}和{password}改成你数据库的用户名和密码）,
还需要手动添加 <a href=\"https://downloads.MySQL.com/archives/c-j/\";> mysql [...]
+ "__html": "<h1>DolphinScheduler升级文档</h1>\n<h2>1. 备份上一版本文件和数据库</h2>\n<h2>2.
停止dolphinscheduler所有服务</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>3. 下载新版本的安装包</h2>\n<ul>\n<li><a
href=\"/zh-cn/download/download.html\">下载</a>,
下载最新版本的二进制安装包</li>\n<li>以下升级操作都需要在新版本的目录进行</li>\n</ul>\n<h2>4.
数据库升级</h2>\n<ul>\n<li>\n<p>如果选择
MySQL，请修改<code>./bin/env/dolphinscheduler_env.sh</code>中的如下配置（{user}和{password}改成你数据库的用户名和密码）,
还需要手动添加 <a href=\"https://downloads.MySQL.com/archives/c-j/\";> mysql [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/upgrade.html",
"meta": {}
}
\ No newline at end of file
