You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/04/18 08:07:49 UTC
[dolphinscheduler] branch dev updated: [doc] Add new release for 3.0.0-alpha (#9519)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 5529a23e5c [doc] Add new release for 3.0.0-alpha (#9519)
5529a23e5c is described below
commit 5529a23e5cc8b9a73e47c58b68e617932c0978d8
Author: Jiajie Zhong <zh...@hotmail.com>
AuthorDate: Mon Apr 18 16:07:43 2022 +0800
[doc] Add new release for 3.0.0-alpha (#9519)
---
docs/configs/index.md.jsx | 2 ++
docs/configs/site.js | 14 ++++-----
docs/docs/en/guide/expansion-reduction.md | 4 +--
docs/docs/en/guide/installation/kubernetes.md | 18 ++++++------
docs/docs/en/guide/start/docker.md | 40 ++++++++++++-------------
docs/docs/en/history-versions.md | 4 +++
docs/docs/zh/guide/expansion-reduction.md | 4 +--
docs/docs/zh/guide/installation/kubernetes.md | 18 ++++++------
docs/docs/zh/guide/start/docker.md | 42 +++++++++++++--------------
docs/docs/zh/history-versions.md | 4 +++
10 files changed, 80 insertions(+), 70 deletions(-)
diff --git a/docs/configs/index.md.jsx b/docs/configs/index.md.jsx
index e3e10cddcc..a27f88948f 100644
--- a/docs/configs/index.md.jsx
+++ b/docs/configs/index.md.jsx
@@ -42,6 +42,7 @@ import docs201Config from '../../../site_config/docs2-0-1';
import docs202Config from '../../../site_config/docs2-0-2';
import docs203Config from '../../../site_config/docs2-0-3';
import docs205Config from '../../../site_config/docs2-0-5';
+import docs300Config from '../../../site_config/docs3-0-0';
import docsDevConfig from '../../../site_config/docsdev';
const docsSource = {
@@ -60,6 +61,7 @@ const docsSource = {
'2.0.2': docs202Config,
'2.0.3': docs203Config,
'2.0.5': docs205Config,
+ '3.0.0': docs300Config,
dev: docsDevConfig,
};
diff --git a/docs/configs/site.js b/docs/configs/site.js
index 01b183f841..a279ac01fe 100644
--- a/docs/configs/site.js
+++ b/docs/configs/site.js
@@ -24,7 +24,7 @@ export default {
port: 8080,
domain: 'dolphinscheduler.apache.org',
copyToDist: ['asset', 'img', 'file', '.asf.yaml', 'sitemap.xml', '.nojekyll', '.htaccess', 'googled0df7b96f277a143.html'],
- docsLatest: '2.0.5',
+ docsLatest: '3.0.0',
defaultSearch: 'google', // default search engine
defaultLanguage: 'en-us',
'en-us': {
@@ -41,12 +41,12 @@ export default {
{
key: 'docs',
text: 'DOCS',
- link: '/en-us/docs/latest/user_doc/guide/quick-start.html',
+ link: '/en-us/docs/latest/user_doc/about/introduction.html',
children: [
{
key: 'docs0',
- text: 'latest(2.0.5)',
- link: '/en-us/docs/latest/user_doc/guide/quick-start.html',
+ text: 'latest(3.0.0-alpha)',
+ link: '/en-us/docs/latest/user_doc/about/introduction.html',
},
{
key: 'docs1',
@@ -227,12 +227,12 @@ export default {
{
key: 'docs',
text: '文档',
- link: '/zh-cn/docs/latest/user_doc/guide/quick-start.html',
+ link: '/zh-cn/docs/latest/user_doc/about/introduction.html',
children: [
{
key: 'docs0',
- text: '最新版本latest(2.0.5)',
- link: '/zh-cn/docs/latest/user_doc/guide/quick-start.html',
+ text: '最新版本latest(3.0.0-alpha)',
+ link: '/zh-cn/docs/latest/user_doc/about/introduction.html',
},
{
key: 'docs1',
diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md
index f34acb57b5..5cb4ad821f 100644
--- a/docs/docs/en/guide/expansion-reduction.md
+++ b/docs/docs/en/guide/expansion-reduction.md
@@ -31,9 +31,9 @@ This article describes how to add a new master service or worker service to an e
mkdir -p /opt
cd /opt
# decompress
-tar -zxvf apache-dolphinscheduler-1.3.8-bin.tar.gz -C /opt
+tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt
cd /opt
-mv apache-dolphinscheduler-1.3.8-bin dolphinscheduler
+mv apache-dolphinscheduler-<version>-bin dolphinscheduler
```
```markdown
diff --git a/docs/docs/en/guide/installation/kubernetes.md b/docs/docs/en/guide/installation/kubernetes.md
index 5cd9c1fe79..01e0a4320e 100644
--- a/docs/docs/en/guide/installation/kubernetes.md
+++ b/docs/docs/en/guide/installation/kubernetes.md
@@ -12,16 +12,16 @@ If you are a new hand and want to experience DolphinScheduler functions, we reco
## Install DolphinScheduler
-Please download the source code package `apache-dolphinscheduler-1.3.8-src.tar.gz`, download address: [download address](/en-us/download/download.html)
+Please download the source code package `apache-dolphinscheduler-<version>-src.tar.gz`, download address: [download address](/en-us/download/download.html)
To publish the release name `dolphinscheduler` version, please execute the following commands:
```
-$ tar -zxvf apache-dolphinscheduler-1.3.8-src.tar.gz
-$ cd apache-dolphinscheduler-1.3.8-src/docker/kubernetes/dolphinscheduler
+$ tar -zxvf apache-dolphinscheduler-<version>-src.tar.gz
+$ cd apache-dolphinscheduler-<version>-src/docker/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
-$ helm install dolphinscheduler . --set image.tag=1.3.8
+$ helm install dolphinscheduler . --set image.tag=<version>
```
To publish the release name `dolphinscheduler` version to `test` namespace:
@@ -193,7 +193,7 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names
2. Create a new `Dockerfile` to add MySQL driver:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -236,7 +236,7 @@ externalDatabase:
2. Create a new `Dockerfile` to add MySQL driver:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -265,7 +265,7 @@ docker build -t apache/dolphinscheduler:mysql-driver .
2. Create a new `Dockerfile` to add Oracle driver:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY ojdbc8-19.9.0.0.jar /opt/dolphinscheduler/lib
```
@@ -288,7 +288,7 @@ docker build -t apache/dolphinscheduler:oracle-driver .
1. Create a new `Dockerfile` to install pip:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
@@ -321,7 +321,7 @@ docker build -t apache/dolphinscheduler:pip .
1. Create a new `Dockerfile` to install Python 3:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md
index 432484c9bc..f0ad7f516b 100644
--- a/docs/docs/en/guide/start/docker.md
+++ b/docs/docs/en/guide/start/docker.md
@@ -39,13 +39,13 @@ Please download the source package apache-dolphinscheduler-x.x.x-src.tar.gz from
> For Windows Docker Desktop user, open **Windows PowerShell**
```
-$ tar -zxvf apache-dolphinscheduler-1.3.8-src.tar.gz
-$ cd apache-dolphinscheduler-1.3.8-src/docker/docker-swarm
-$ docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
-$ docker tag apache/dolphinscheduler:1.3.8 apache/dolphinscheduler:latest
+$ tar -zxvf apache-dolphinscheduler-<version>-src.tar.gz
+$ cd apache-dolphinscheduler-<version>-src/docker/docker-swarm
+$ docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+$ docker tag apache/dolphinscheduler:<version> apache/dolphinscheduler:latest
$ docker-compose up -d
```
-> PowerShell should use `cd apache-dolphinscheduler-1.3.8-src\docker\docker-swarm`
+> PowerShell should use `cd apache-dolphinscheduler-<version>-src\docker\docker-swarm`
**PostgreSQL** (user `root`, password `root`, database `dolphinscheduler`) and **ZooKeeper** services will be started by default
@@ -78,7 +78,7 @@ This method requires the installation of [docker](https://docs.docker.com/engine
We have uploaded the DolphinScheduler images for users to the docker repository. Instead of building the image locally, users can pull the image from the docker repository by running the following command.
```
-docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
```
#### 5. Run a DolphinScheduler instance
@@ -89,7 +89,7 @@ $ docker run -d --name dolphinscheduler \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-p 12345:12345 \
-apache/dolphinscheduler:1.3.8 all
+apache/dolphinscheduler:<version> all
```
Note: The database user test and password test need to be replaced with the actual PostgreSQL user and password. 192.168.x.x needs to be replaced with the host IP of PostgreSQL and ZooKeeper.
@@ -118,7 +118,7 @@ $ docker run -d --name dolphinscheduler-master \
-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-apache/dolphinscheduler:1.3.8 master-server
+apache/dolphinscheduler:<version> master-server
```
* Start a **worker server**, as follows:
@@ -128,7 +128,7 @@ $ docker run -d --name dolphinscheduler-worker \
-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-apache/dolphinscheduler:1.3.8 worker-server
+apache/dolphinscheduler:<version> worker-server
```
* Start a **api server**, as follows:
@@ -139,7 +139,7 @@ $ docker run -d --name dolphinscheduler-api \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-p 12345:12345 \
-apache/dolphinscheduler:1.3.8 api-server
+apache/dolphinscheduler:<version> api-server
```
* Start a **alter server**, as follows:
@@ -148,7 +148,7 @@ apache/dolphinscheduler:1.3.8 api-server
$ docker run -d --name dolphinscheduler-alert \
-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-apache/dolphinscheduler:1.3.8 alert-server
+apache/dolphinscheduler:<version> alert-server
```
**NOTE**: When you run some of the services in dolphinscheduler, you must specify these environment variables `DATABASE_HOST`, `DATABASE_PORT`, `DATABASE_DATABASE`, `DATABASE_USERNAME`, `DATABASE_ PASSWORD`, `ZOOKEEPER_QUORUM`.
@@ -312,14 +312,14 @@ If you don't understand `. /docker/build/hooks/build` `. /docker/build/hooks/bui
#### Build from binary packages (Maven 3.3+ & JDK 1.8+ not required)
-Please download the binary package apache-dolphinscheduler-1.3.8-bin.tar.gz from: [download](/zh-cn/download/download.html). Then put apache-dolphinscheduler-1.3.8-bin.tar.gz into the `apache-dolphinscheduler-1.3.8-src/docker/build` directory and execute it in Terminal or PowerShell:
+Please download the binary package apache-dolphinscheduler-<version>-bin.tar.gz from: [download](/zh-cn/download/download.html). Then put apache-dolphinscheduler-<version>-bin.tar.gz into the `apache-dolphinscheduler-<version>-src/docker/build` directory and execute it in Terminal or PowerShell:
```
-$ cd apache-dolphinscheduler-1.3.8-src/docker/build
-$ docker build --build-arg VERSION=1.3.8 -t apache/dolphinscheduler:1.3.8 .
+$ cd apache-dolphinscheduler-<version>-src/docker/build
+$ docker build --build-arg VERSION=<version> -t apache/dolphinscheduler:<version> .
```
-> PowerShell should use `cd apache-dolphinscheduler-1.3.8-src/docker/build`
+> PowerShell should use `cd apache-dolphinscheduler-<version>-src/docker/build`
#### Building images for multi-platform architectures
@@ -374,7 +374,7 @@ done
2. Create a new `Dockerfile` to add the MySQL driver package:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -420,7 +420,7 @@ DATABASE_PARAMS=useUnicode=true&characterEncoding=UTF-8
2. Create a new `Dockerfile` to add the MySQL driver package:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -449,7 +449,7 @@ docker build -t apache/dolphinscheduler:mysql-driver .
2. Create a new `Dockerfile` to add the Oracle driver package:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY ojdbc8-19.9.0.0.jar /opt/dolphinscheduler/lib
```
@@ -472,7 +472,7 @@ docker build -t apache/dolphinscheduler:oracle-driver .
1. Create a new `Dockerfile` for installing pip:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
@@ -506,7 +506,7 @@ docker build -t apache/dolphinscheduler:pip .
1. Create a new `Dockerfile` for installing Python 3:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
diff --git a/docs/docs/en/history-versions.md b/docs/docs/en/history-versions.md
index 59fbd8429f..85d8445b20 100644
--- a/docs/docs/en/history-versions.md
+++ b/docs/docs/en/history-versions.md
@@ -4,6 +4,10 @@
#### Setup instructions, are available for each stable version of Apache DolphinScheduler below:
+### Versions: 3.0.0-alpha
+
+#### Links： [3.0.0-alpha Document](../3.0.0/user_doc/about/introduction.md)
+
### Versions: 2.0.5
#### Links： [2.0.5 Document](../2.0.5/user_doc/guide/quick-start.md)
diff --git a/docs/docs/zh/guide/expansion-reduction.md b/docs/docs/zh/guide/expansion-reduction.md
index ffe071532b..1ed6a5b818 100644
--- a/docs/docs/zh/guide/expansion-reduction.md
+++ b/docs/docs/zh/guide/expansion-reduction.md
@@ -29,9 +29,9 @@
mkdir -p /opt
cd /opt
# 解压缩
-tar -zxvf apache-dolphinscheduler-1.3.8-bin.tar.gz -C /opt
+tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt
cd /opt
-mv apache-dolphinscheduler-1.3.8-bin dolphinscheduler
+mv apache-dolphinscheduler-<version>-bin dolphinscheduler
```
```markdown
diff --git a/docs/docs/zh/guide/installation/kubernetes.md b/docs/docs/zh/guide/installation/kubernetes.md
index 5b66816794..d7c9245c94 100644
--- a/docs/docs/zh/guide/installation/kubernetes.md
+++ b/docs/docs/zh/guide/installation/kubernetes.md
@@ -13,16 +13,16 @@ Kubernetes部署目的是在Kubernetes集群中部署 DolphinScheduler 服务，
## 安装 dolphinscheduler
-请下载源码包 apache-dolphinscheduler-1.3.8-src.tar.gz，下载地址: [下载](/zh-cn/download/download.html)
+请下载源码包 apache-dolphinscheduler-<version>-src.tar.gz，下载地址: [下载](/zh-cn/download/download.html)
发布一个名为 `dolphinscheduler` 的版本(release)，请执行以下命令：
```
-$ tar -zxvf apache-dolphinscheduler-1.3.8-src.tar.gz
-$ cd apache-dolphinscheduler-1.3.8-src/docker/kubernetes/dolphinscheduler
+$ tar -zxvf apache-dolphinscheduler-<version>-src.tar.gz
+$ cd apache-dolphinscheduler-<version>-src/docker/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
-$ helm install dolphinscheduler . --set image.tag=1.3.8
+$ helm install dolphinscheduler . --set image.tag=<version>
```
将名为 `dolphinscheduler` 的版本(release) 发布到 `test` 的命名空间中：
@@ -194,7 +194,7 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names
2. 创建一个新的 `Dockerfile`，用于添加 MySQL 的驱动包:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -237,7 +237,7 @@ externalDatabase:
2. 创建一个新的 `Dockerfile`，用于添加 MySQL 驱动包:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -266,7 +266,7 @@ docker build -t apache/dolphinscheduler:mysql-driver .
2. 创建一个新的 `Dockerfile`，用于添加 Oracle 驱动包:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY ojdbc8-19.9.0.0.jar /opt/dolphinscheduler/lib
```
@@ -289,7 +289,7 @@ docker build -t apache/dolphinscheduler:oracle-driver .
1. 创建一个新的 `Dockerfile`，用于安装 pip:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
@@ -322,7 +322,7 @@ docker build -t apache/dolphinscheduler:pip .
1. 创建一个新的 `Dockerfile`，用于安装 Python 3:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md
index 6e9970024b..9ae2178999 100644
--- a/docs/docs/zh/guide/start/docker.md
+++ b/docs/docs/zh/guide/start/docker.md
@@ -30,7 +30,7 @@
#### 1、下载源码包
-请下载源码包 apache-dolphinscheduler-1.3.8-src.tar.gz，下载地址: [下载](/zh-cn/download/download.html)
+请下载源码包 apache-dolphinscheduler-<version>-src.tar.gz，下载地址: [下载](/zh-cn/download/download.html)
#### 2、拉取镜像并启动服务
@@ -39,14 +39,14 @@
> 对于 Windows Docker Desktop 用户，打开 **Windows PowerShell**
```
-$ tar -zxvf apache-dolphinscheduler-1.3.8-src.tar.gz
-$ cd apache-dolphinscheduler-1.3.8-src/docker/docker-swarm
-$ docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
-$ docker tag apache/dolphinscheduler:1.3.8 apache/dolphinscheduler:latest
+$ tar -zxvf apache-dolphinscheduler-<version>-src.tar.gz
+$ cd apache-dolphinscheduler-<version>-src/docker/docker-swarm
+$ docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
+$ docker tag apache/dolphinscheduler:<version> apache/dolphinscheduler:latest
$ docker-compose up -d
```
-> PowerShell 应该使用 `cd apache-dolphinscheduler-1.3.8-src\docker\docker-swarm`
+> PowerShell 应该使用 `cd apache-dolphinscheduler-<version>-src\docker\docker-swarm`
**PostgreSQL** (用户 `root`, 密码 `root`, 数据库 `dolphinscheduler`) 和 **ZooKeeper** 服务将会默认启动
@@ -79,7 +79,7 @@ $ docker-compose up -d
我们已将面向用户的 DolphinScheduler 镜像上传至 docker 仓库，用户无需在本地构建镜像，直接执行以下命令从 docker 仓库 pull 镜像：
```
-docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+docker pull dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
```
#### 5、运行一个 DolphinScheduler 实例
@@ -90,7 +90,7 @@ $ docker run -d --name dolphinscheduler \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-p 12345:12345 \
-apache/dolphinscheduler:1.3.8 all
+apache/dolphinscheduler:<version> all
```
注：数据库用户 test 和密码 test 需要替换为实际的 PostgreSQL 用户和密码，192.168.x.x 需要替换为 PostgreSQL 和 ZooKeeper 的主机 IP
@@ -119,7 +119,7 @@ $ docker run -d --name dolphinscheduler-master \
-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-apache/dolphinscheduler:1.3.8 master-server
+apache/dolphinscheduler:<version> master-server
```
* 启动一个 **worker server**, 如下:
@@ -129,7 +129,7 @@ $ docker run -d --name dolphinscheduler-worker \
-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-apache/dolphinscheduler:1.3.8 worker-server
+apache/dolphinscheduler:<version> worker-server
```
* 启动一个 **api server**, 如下:
@@ -140,7 +140,7 @@ $ docker run -d --name dolphinscheduler-api \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-e ZOOKEEPER_QUORUM="192.168.x.x:2181" \
-p 12345:12345 \
-apache/dolphinscheduler:1.3.8 api-server
+apache/dolphinscheduler:<version> api-server
```
* 启动一个 **alert server**, 如下:
@@ -149,7 +149,7 @@ apache/dolphinscheduler:1.3.8 api-server
$ docker run -d --name dolphinscheduler-alert \
-e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
-e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
-apache/dolphinscheduler:1.3.8 alert-server
+apache/dolphinscheduler:<version> alert-server
```
**注意**: 当你运行 dolphinscheduler 中的部分服务时，你必须指定这些环境变量 `DATABASE_HOST`, `DATABASE_PORT`, `DATABASE_DATABASE`, `DATABASE_USERNAME`, `DATABASE_PASSWORD`, `ZOOKEEPER_QUORUM`。
@@ -313,14 +313,14 @@ C:\dolphinscheduler-src>.\docker\build\hooks\build.bat
#### 从二进制包构建 (不需要 Maven 3.3+ & JDK 1.8+)
-请下载二进制包 apache-dolphinscheduler-1.3.8-bin.tar.gz，下载地址: [下载](/zh-cn/download/download.html). 然后将 apache-dolphinscheduler-1.3.8-bin.tar.gz 放到 `apache-dolphinscheduler-1.3.8-src/docker/build` 目录里，在 Terminal 或 PowerShell 中执行:
+请下载二进制包 apache-dolphinscheduler-<version>-bin.tar.gz，下载地址: [下载](/zh-cn/download/download.html). 然后将 apache-dolphinscheduler-<version>-bin.tar.gz 放到 `apache-dolphinscheduler-<version>-src/docker/build` 目录里，在 Terminal 或 PowerShell 中执行:
```
-$ cd apache-dolphinscheduler-1.3.8-src/docker/build
-$ docker build --build-arg VERSION=1.3.8 -t apache/dolphinscheduler:1.3.8 .
+$ cd apache-dolphinscheduler-<version>-src/docker/build
+$ docker build --build-arg VERSION=<version> -t apache/dolphinscheduler:<version> .
```
-> PowerShell 应该使用 `cd apache-dolphinscheduler-1.3.8-src/docker/build`
+> PowerShell 应该使用 `cd apache-dolphinscheduler-<version>-src/docker/build`
#### 构建多平台架构镜像
@@ -375,7 +375,7 @@ done
2. 创建一个新的 `Dockerfile`，用于添加 MySQL 的驱动包:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -421,7 +421,7 @@ DATABASE_PARAMS=useUnicode=true&characterEncoding=UTF-8
2. 创建一个新的 `Dockerfile`，用于添加 MySQL 驱动包:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib
```
@@ -450,7 +450,7 @@ docker build -t apache/dolphinscheduler:mysql-driver .
2. 创建一个新的 `Dockerfile`，用于添加 Oracle 驱动包:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY ojdbc8-19.9.0.0.jar /opt/dolphinscheduler/lib
```
@@ -473,7 +473,7 @@ docker build -t apache/dolphinscheduler:oracle-driver .
1. 创建一个新的 `Dockerfile`，用于安装 pip:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
@@ -506,7 +506,7 @@ docker build -t apache/dolphinscheduler:pip .
1. 创建一个新的 `Dockerfile`，用于安装 Python 3:
```
-FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:1.3.8
+FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler:<version>
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
diff --git a/docs/docs/zh/history-versions.md b/docs/docs/zh/history-versions.md
index 8911931b6c..64f7b4ca8f 100644
--- a/docs/docs/zh/history-versions.md
+++ b/docs/docs/zh/history-versions.md
@@ -3,6 +3,10 @@
# 历史版本：
#### 以下是Apache DolphinScheduler每个稳定版本的设置说明。
+### Versions: 3.0.0-alpha
+
+#### Links： [3.0.0-alpha 文档](../3.0.0/user_doc/about/introduction.md)
+
### 版本：2.0.5
#### 地址：[2.0.5 文档](../2.0.5/user_doc/guide/quick-start.md)