Skip to content

Commit ef003c6

Browse files
dbaczhongjiajie
authored andcommitted
Pre release change
1 parent 6d7dbe6 commit ef003c6

24 files changed

+346
-434
lines changed

Diff for: deploy/docker/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
#
18-
HUB=ghcr.io/apache/dolphinscheduler
19-
TAG=latest
18+
HUB=apache
19+
TAG=3.2.0
2020

2121
TZ=Asia/Shanghai
2222
DATABASE=postgresql

Diff for: deploy/kubernetes/dolphinscheduler/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ type: application
3535

3636
# This is the chart version. This version number should be incremented each time you make changes
3737
# to the chart and its templates, including the app version.
38-
version: 3.1.0
38+
version: 3.2.0
3939

4040
# This is the version number of the application being deployed. This version number should be
4141
# incremented each time you make changes to the application.
42-
appVersion: 3.1.0
42+
appVersion: 3.2.0
4343

4444
dependencies:
4545
- name: postgresql

Diff for: deploy/kubernetes/dolphinscheduler/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ initImage:
2828

2929
image:
3030
registry: "dolphinscheduler.docker.scarf.sh/apache"
31-
tag: "dev-SNAPSHOT"
31+
tag: "3.2.0"
3232
pullPolicy: "IfNotPresent"
3333
pullSecret: ""
3434
master: dolphinscheduler-master

Diff for: docs/configs/docsdev.js

+294-294
Large diffs are not rendered by default.

Diff for: docs/docs/en/guide/expansion-reduction.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Attention: DolphinScheduler itself does not depend on Hadoop, Hive, Spark, but w
3030
mkdir -p /opt
3131
cd /opt
3232
# decompress
33-
tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt
33+
tar -zxvf apache-dolphinscheduler-3.2.0-bin.tar.gz -C /opt
3434
cd /opt
35-
mv apache-dolphinscheduler-<version>-bin dolphinscheduler
35+
mv apache-dolphinscheduler-3.2.0-bin dolphinscheduler
3636
```
3737

3838
```markdown

Diff for: docs/docs/en/guide/installation/kubernetes.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ If you are a new hand and want to experience DolphinScheduler functions, we reco
1212

1313
## Install DolphinScheduler
1414

15-
Please download the source code package `apache-dolphinscheduler-<version>-src.tar.gz`, download address: [download address](https://dolphinscheduler.apache.org/en-us/download)
15+
Please download the source code package `apache-dolphinscheduler-3.2.0-src.tar.gz`, download address: [download address](https://dolphinscheduler.apache.org/en-us/download)
1616

1717
To publish the release name `dolphinscheduler` version, please execute the following commands:
1818

1919
```
20-
$ tar -zxvf apache-dolphinscheduler-<version>-src.tar.gz
21-
$ cd apache-dolphinscheduler-<version>-src/deploy/kubernetes/dolphinscheduler
20+
$ tar -zxvf apache-dolphinscheduler-3.2.0-src.tar.gz
21+
$ cd apache-dolphinscheduler-3.2.0-src/deploy/kubernetes/dolphinscheduler
2222
$ helm repo add bitnami https://charts.bitnami.com/bitnami
2323
$ helm dependency update .
24-
$ helm install dolphinscheduler . --set image.tag=<version>
24+
$ helm install dolphinscheduler . --set image.tag=3.2.0
2525
```
2626

2727
To publish the release name `dolphinscheduler` version to `test` namespace:
@@ -232,9 +232,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names
232232
2. Create a new `Dockerfile` to add MySQL driver:
233233

234234
```
235-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
235+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.2.0
236236
# For example
237-
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:<version>
237+
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.2.0
238238
239239
# Attention Please, If the build is dolphinscheduler-tools image
240240
# You need to change the following line to: COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/tools/libs
@@ -283,9 +283,9 @@ externalDatabase:
283283
2. Create a new `Dockerfile` to add MySQL or Oracle driver:
284284

285285
```
286-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
286+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.2.0
287287
# For example
288-
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
288+
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.0
289289
290290
# If you want to support MySQL Datasource
291291
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/libs
@@ -315,7 +315,7 @@ docker build -t apache/dolphinscheduler-<service>:new-driver .
315315
1. Create a new `Dockerfile` to install pip:
316316

317317
```
318-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
318+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.0
319319
COPY requirements.txt /tmp
320320
RUN apt-get update && \
321321
apt-get install -y --no-install-recommends python-pip && \
@@ -350,7 +350,7 @@ docker build -t apache/dolphinscheduler-worker:pip .
350350
1. Create a new `Dockerfile` to install Python 3:
351351
352352
```
353-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
353+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.0
354354
RUN apt-get update && \
355355
apt-get install -y --no-install-recommends python3 && \
356356
rm -rf /var/lib/apt/lists/*

Diff for: docs/docs/en/guide/installation/standalone.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If you want to deploy DolphinScheduler in production, we recommend you follow [c
1212
## Preparation
1313

1414
- JDK:download [JDK][jdk] (1.8+), install and configure environment variable `JAVA_HOME` and append `bin` dir (included in `JAVA_HOME`) to `PATH` variable. You can skip this step if it already exists in your environment.
15-
- Binary package: download the DolphinScheduler binary package at [download page](https://dolphinscheduler.apache.org/en-us/download/<version>). <!-- markdown-link-check-disable-line -->
15+
- Binary package: download the DolphinScheduler binary package at [download page](https://dolphinscheduler.apache.org/en-us/download/3.2.0). <!-- markdown-link-check-disable-line -->
1616

1717
## Start DolphinScheduler Standalone Server
1818

Diff for: docs/docs/en/guide/start/docker.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Start DolphinScheduler with standalone-server Docker images is the easiest way t
1919
you can learn DolphinScheduler's concepts and usage, with minimal cost.
2020

2121
```shell
22-
$ DOLPHINSCHEDULER_VERSION=<version>
22+
$ DOLPHINSCHEDULER_VERSION=3.2.0
2323
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
2424
```
2525

@@ -37,11 +37,11 @@ be stored on disks after you change docker-compose configuration, and it is robu
3737
DolphinScheduler in a long term. You have to install [docker-compose](https://docs.docker.com/compose/install/) before you
3838
start servers.
3939

40-
After complete the installation, get the `docker-compose.yaml` file from [download page](https://dolphinscheduler.apache.org/en-us/download/<version>)
40+
After complete the installation, get the `docker-compose.yaml` file from [download page](https://dolphinscheduler.apache.org/en-us/download/3.2.0)
4141
form its source package, and make sure you get the right version. After download the package, you can run the commands as below.
4242

4343
```shell
44-
$ DOLPHINSCHEDULER_VERSION=<version>
44+
$ DOLPHINSCHEDULER_VERSION=3.2.0
4545
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
4646
# Going to docker-compose's location
4747
# For Mac or Linux users
@@ -68,7 +68,7 @@ $ docker-compose --profile all up -d
6868
container when it up. You could start DolphinScheduler server separately if you want to reuse your exists services.
6969

7070
```shell
71-
$ DOLPHINSCHEDULER_VERSION=<version>
71+
$ DOLPHINSCHEDULER_VERSION=3.2.0
7272
# Initialize the database, make sure database <DATABASE> already exists
7373
$ docker run -d --name dolphinscheduler-tools \
7474
-e DATABASE="postgresql" \
@@ -134,5 +134,5 @@ and use `admin` and `dolphinscheduler123` as default username and password in th
134134

135135
You can modify some environment variables to change configurations when you are starting servers through Docker. We have
136136
an example in [using exists PostgreSQL ZooKeeper](#using-exists-postgresql-zookeeper) to change database and ZooKeeper configurations,
137-
and you could find all environment variables in [all environment variables](https://github.com/apache/dolphinscheduler/blob/<version>/script/env/dolphinscheduler_env.sh) <!-- markdown-link-check-disable-line -->
137+
and you could find all environment variables in [all environment variables](https://github.com/apache/dolphinscheduler/blob/3.2.0/script/env/dolphinscheduler_env.sh) <!-- markdown-link-check-disable-line -->
138138
and change them if you want.

Diff for: docs/docs/en/history-versions.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#### Setup instructions, are available for each stable version of Apache DolphinScheduler below:
66

7+
### Versions: 3.2.0
8+
9+
#### Links: [3.2.0 Document](../3.2.0/user_doc/about/introduction.md)
10+
711
### Versions: 3.1.8
812

913
#### Links: [3.1.8 Document](../3.1.8/user_doc/about/introduction.md)

Diff for: docs/docs/zh/guide/expansion-reduction.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
mkdir -p /opt
3131
cd /opt
3232
# 解压缩
33-
tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt
33+
tar -zxvf apache-dolphinscheduler-3.2.0-bin.tar.gz -C /opt
3434
cd /opt
35-
mv apache-dolphinscheduler-<version>-bin dolphinscheduler
35+
mv apache-dolphinscheduler-3.2.0-bin dolphinscheduler
3636
```
3737

3838
```markdown

Diff for: docs/docs/zh/guide/installation/kubernetes.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ Kubernetes 部署目的是在 Kubernetes 集群中部署 DolphinScheduler 服务
1212

1313
## 安装 dolphinscheduler
1414

15-
请下载源码包 apache-dolphinscheduler-<version>-src.tar.gz,下载地址: [下载](https://dolphinscheduler.apache.org/zh-cn/download)
15+
请下载源码包 apache-dolphinscheduler-3.2.0-src.tar.gz,下载地址: [下载](https://dolphinscheduler.apache.org/zh-cn/download)
1616

1717
发布一个名为 `dolphinscheduler` 的版本(release),请执行以下命令:
1818

1919
```
20-
$ tar -zxvf apache-dolphinscheduler-<version>-src.tar.gz
21-
$ cd apache-dolphinscheduler-<version>-src/deploy/kubernetes/dolphinscheduler
20+
$ tar -zxvf apache-dolphinscheduler-3.2.0-src.tar.gz
21+
$ cd apache-dolphinscheduler-3.2.0-src/deploy/kubernetes/dolphinscheduler
2222
$ helm repo add bitnami https://charts.bitnami.com/bitnami
2323
$ helm dependency update .
24-
$ helm install dolphinscheduler . --set image.tag=<version>
24+
$ helm install dolphinscheduler . --set image.tag=3.2.0
2525
```
2626

2727
将名为 `dolphinscheduler` 的版本(release) 发布到 `test` 的命名空间中:
@@ -231,9 +231,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names
231231
2. 创建一个新的 `Dockerfile`,用于添加 MySQL 的驱动包:
232232

233233
```
234-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
234+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.2.0
235235
# 例如
236-
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:<version>
236+
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.2.0
237237
238238
# 注意,如果构建的是dolphinscheduler-tools镜像
239239
# 需要将下面一行修改为COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/tools/libs
@@ -282,9 +282,9 @@ externalDatabase:
282282
2. 创建一个新的 `Dockerfile`,用于添加 MySQL 或者 Oracle 驱动包:
283283

284284
```
285-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:<version>
285+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.2.0
286286
# 例如
287-
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
287+
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.0
288288
289289
# 如果你想支持 MySQL 数据源
290290
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/libs
@@ -314,7 +314,7 @@ docker build -t apache/dolphinscheduler-<service>:new-driver .
314314
1. 创建一个新的 `Dockerfile`,用于安装 pip:
315315

316316
```
317-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
317+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.0
318318
COPY requirements.txt /tmp
319319
RUN apt-get update && \
320320
apt-get install -y --no-install-recommends python-pip && \
@@ -349,7 +349,7 @@ docker build -t apache/dolphinscheduler-worker:pip .
349349
1. 创建一个新的 `Dockerfile`,用于安装 Python 3:
350350
351351
```
352-
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:<version>
352+
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.2.0
353353
RUN apt-get update && \
354354
apt-get install -y --no-install-recommends python3 && \
355355
rm -rf /var/lib/apt/lists/*

Diff for: docs/docs/zh/guide/installation/standalone.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Standalone 仅适用于 DolphinScheduler 的快速体验.
1010
## 前置准备工作
1111

1212
- JDK:下载[JDK][jdk] (1.8+),安装并配置 `JAVA_HOME` 环境变量,并将其下的 `bin` 目录追加到 `PATH` 环境变量中。如果你的环境中已存在,可以跳过这步。
13-
- 二进制包:在[下载页面](https://dolphinscheduler.apache.org/en-us/download/<version>)下载 DolphinScheduler 二进制包 <!-- markdown-link-check-disable-line -->
13+
- 二进制包:在[下载页面](https://dolphinscheduler.apache.org/en-us/download/3.2.0)下载 DolphinScheduler 二进制包 <!-- markdown-link-check-disable-line -->
1414

1515
## 启动 DolphinScheduler Standalone Server
1616

Diff for: docs/docs/zh/guide/start/docker.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
你可以最快速的体验到 DolphinScheduler 的大部分功能,了解主要和概念和内容。
1919

2020
```shell
21-
$ DOLPHINSCHEDULER_VERSION=<version>
21+
$ DOLPHINSCHEDULER_VERSION=3.2.0
2222
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
2323
```
2424

@@ -33,11 +33,11 @@ $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:2
3333
服务重启的时候保留元数据(如需要挂载到本地路径需要做指定)。他更健壮,能保证用户体验更加完整的 DolphinScheduler 服务。这种方式需要先安装
3434
[docker-compose](https://docs.docker.com/compose/install/),链接适用于 Mac,Linux,Windows。
3535

36-
确保 docker-compose 顺利安装后,需要获取 `docker-compose.yaml` 文件,通过[下载页面](https://dolphinscheduler.apache.org/en-us/download/<version>)
36+
确保 docker-compose 顺利安装后,需要获取 `docker-compose.yaml` 文件,通过[下载页面](https://dolphinscheduler.apache.org/en-us/download/3.2.0)
3737
下载对应版本源码包可能是最快的方法,当下载完源码后就可以运行命令进行部署了。
3838

3939
```shell
40-
$ DOLPHINSCHEDULER_VERSION=<version>
40+
$ DOLPHINSCHEDULER_VERSION=3.2.0
4141
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
4242
# Mac Linux 用户
4343
$ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker
@@ -61,7 +61,7 @@ $ docker-compose --profile all up -d
6161
ZooKeeper 且不想启动新的服务,可以使用这个方式分别启动 DolphinScheduler 容器。
6262

6363
```shell
64-
$ DOLPHINSCHEDULER_VERSION=<version>
64+
$ DOLPHINSCHEDULER_VERSION=3.2.0
6565
# 初始化数据库,其确保数据库 <DATABASE> 已经存在
6666
$ docker run -d --name dolphinscheduler-tools \
6767
-e DATABASE="postgresql" \

Diff for: docs/docs/zh/history-versions.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
#### 以下是Apache DolphinScheduler每个稳定版本的设置说明。
66

7+
### Versions: 3.2.0
8+
9+
#### Links: [3.2.0 Document](../3.2.0/user_doc/about/introduction.md)
10+
711
### Versions: 3.1.8
812

913
#### Links: [3.1.8 Document](../3.1.8/user_doc/about/introduction.md)

Diff for: dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ CREATE TABLE t_ds_version
10521052
-- Records of t_ds_version
10531053
-- ----------------------------
10541054
INSERT INTO t_ds_version
1055-
VALUES ('1', '3.3.0');
1055+
VALUES ('1', '3.2.0');
10561056

10571057

10581058
-- ----------------------------

Diff for: dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ CREATE TABLE `t_ds_version` (
10431043
-- ----------------------------
10441044
-- Records of t_ds_version
10451045
-- ----------------------------
1046-
INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.3.0');
1046+
INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.2.0');
10471047

10481048

10491049
-- ----------------------------

Diff for: dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time)
10411041
VALUES ('default', 'default', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
10421042

10431043
-- Records of t_ds_queue,default queue name : default
1044-
INSERT INTO t_ds_version(version) VALUES ('3.3.0');
1044+
INSERT INTO t_ds_version(version) VALUES ('3.2.0');
10451045

10461046
--
10471047
-- Table structure for table t_ds_plugin_define
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.0
1+
3.2.0

Diff for: dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_ddl.sql

-16
This file was deleted.

Diff for: dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_ddl_post.sql

-16
This file was deleted.

Diff for: dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_dml.sql

-16
This file was deleted.

Diff for: dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/postgresql/dolphinscheduler_ddl.sql

-16
This file was deleted.

0 commit comments

Comments
 (0)