Skip to content

Commit f982e1d

Browse files
[3.1.0-prepare] Update version to 310 (#12146)
Co-authored-by: Jiajie Zhong <[email protected]>
1 parent 3efe4bc commit f982e1d

File tree

15 files changed

+275
-267
lines changed

15 files changed

+275
-267
lines changed

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.1.0
2020

2121
TZ=Asia/Shanghai
2222
DATABASE=postgresql

deploy/kubernetes/dolphinscheduler/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ version: 2.0.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: dev-SNAPSHOT
42+
appVersion: 3.1.0
4343

4444
dependencies:
4545
- name: postgresql

deploy/kubernetes/dolphinscheduler/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ timezone: "Asia/Shanghai"
2323

2424
image:
2525
registry: "dolphinscheduler.docker.scarf.sh/apache"
26-
tag: "dev-SNAPSHOT"
26+
tag: "3.1.0"
2727
pullPolicy: "IfNotPresent"
2828
pullSecret: ""
2929

docs/configs/docsdev.js

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

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.1.0-bin.tar.gz -C /opt
3434
cd /opt
35-
mv apache-dolphinscheduler-<version>-bin dolphinscheduler
35+
mv apache-dolphinscheduler-3.1.0-bin dolphinscheduler
3636
```
3737

3838
```markdown

docs/docs/en/guide/start/docker.md

+4-4
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.1.0
2323
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
2424
```
2525

@@ -49,7 +49,7 @@ After complete the configuration, we can get the `docker-compose.yaml` file from
4949
form its source package, and make sure you get the right version. After download the package, you can run the commands as below.
5050

5151
```shell
52-
$ DOLPHINSCHEDULER_VERSION=<version>
52+
$ DOLPHINSCHEDULER_VERSION=3.1.0
5353
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
5454
# Going to docker-compose's location
5555
# For Mac or Linux users
@@ -72,7 +72,7 @@ $ docker-compose --profile all up -d
7272
container when it up. You could start DolphinScheduler server separately if you want to reuse your exists services.
7373

7474
```shell
75-
$ DOLPHINSCHEDULER_VERSION=<version>
75+
$ DOLPHINSCHEDULER_VERSION=3.1.0
7676
# Initialize the database, make sure database <DATABASE> already exists
7777
$ docker run -d --name dolphinscheduler-tools \
7878
-e DATABASE="postgresql" \
@@ -133,5 +133,5 @@ and use `admin` and `dolphinscheduler123` as default username and password in th
133133

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

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.1.0
8+
9+
#### Links: [3.1.0 Document](../3.1.0/user_doc/about/introduction.md)
10+
711
### Versions: 3.0.0
812

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

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.1.0-bin.tar.gz -C /opt
3434
cd /opt
35-
mv apache-dolphinscheduler-<version>-bin dolphinscheduler
35+
mv apache-dolphinscheduler-3.1.0-bin dolphinscheduler
3636
```
3737

3838
```markdown

docs/docs/zh/guide/start/docker.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
本教程使用三种不同的方式通过 Docker 完成 DolphinScheduler 的部署,如果你想要快速体验,推荐使用 standalone-server 镜像,
44
如果你想要体验比较完成的服务,推荐使用 docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务
5-
你想要沿用这些基础服务,你可以参考沿用已有的 PostgreSQL 和 ZooKeeper 服务完成部署。
5+
你想要沿用这些基础服务,你可以参考沿用已有的 PostgreSQL 和 ZooKeeper 服务完成部署。
66

77
## 前置条件
88

@@ -17,7 +17,7 @@
1717
你可以最快速的体验到 DolphinScheduler 的大部分功能,了解主要和概念和内容。
1818

1919
```shell
20-
$ DOLPHINSCHEDULER_VERSION=<version>
20+
$ DOLPHINSCHEDULER_VERSION=3.1.0
2121
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
2222
```
2323

@@ -43,7 +43,7 @@ $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:2
4343
源码包对应的值为 "Total Source Code"。当下载完源码后就可以运行命令进行部署了。
4444

4545
```shell
46-
$ DOLPHINSCHEDULER_VERSION=<version>
46+
$ DOLPHINSCHEDULER_VERSION=3.1.0
4747
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
4848
# Mac Linux 用户
4949
$ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker
@@ -56,7 +56,7 @@ $ docker-compose --profile schema up -d
5656
$ docker-compose --profile all up -d
5757
```
5858

59-
> 提醒:通过 docker-compose 启动服务时,除了会启动 DolphinScheduler 对应的服务外,还会启动必要依赖服务,如数据库 PostgreSQL(用户
59+
> 提醒:通过 docker-compose 启动服务时,除了会启动 DolphinScheduler 对应的服务外,还会启动必要依赖服务,如数据库 PostgreSQL(用户
6060
> `root`, 密码 `root`, 数据库 `dolphinscheduler`) 和 服务发现 ZooKeeper。
6161
6262
### 沿用已有的 PostgreSQL 和 ZooKeeper 服务
@@ -65,7 +65,7 @@ $ docker-compose --profile all up -d
6565
ZooKeeper 且不想启动新的服务,可以使用这个方式分别启动 DolphinScheduler 容器。
6666

6767
```shell
68-
$ DOLPHINSCHEDULER_VERSION=<version>
68+
$ DOLPHINSCHEDULER_VERSION=3.1.0
6969
# 初始化数据库,其确保数据库 <DATABASE> 已经存在
7070
$ docker run -d --name dolphinscheduler-tools \
7171
-e DATABASE="postgresql" \
@@ -126,4 +126,4 @@ $ docker run -d --name dolphinscheduler-alert-server \
126126
## 环境变量
127127

128128
可以通过环境变量来修改 Docker 运行的配置,我们在沿用已有的 PostgreSQL 和 ZooKeeper 服务中就通过环境变量修改了 Docker 的数据库配置和
129-
注册中心配置,关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/<version>/script/env/dolphinscheduler_env.sh) 了解 <!-- markdown-link-check-disable-line -->
129+
注册中心配置,关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/3.1.0/script/env/dolphinscheduler_env.sh) 了解 <!-- markdown-link-check-disable-line -->

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.1.0
8+
9+
#### Links: [3.1.0 文档](../3.1.0/user_doc/about/introduction.md)
10+
711
### Versions: 3.0.0
812

913
#### Links: [3.0.0 文档](../3.0.0/user_doc/about/introduction.md)

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ CREATE TABLE t_ds_version
989989
-- Records of t_ds_version
990990
-- ----------------------------
991991
INSERT INTO t_ds_version
992-
VALUES ('1', '1.4.0');
992+
VALUES ('1', '3.1.0');
993993

994994

995995
-- ----------------------------

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ CREATE TABLE `t_ds_version` (
980980
-- ----------------------------
981981
-- Records of t_ds_version
982982
-- ----------------------------
983-
INSERT IGNORE INTO `t_ds_version` VALUES ('1', '2.0.2');
983+
INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.1.0');
984984

985985

986986
-- ----------------------------

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql

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

973973
-- Records of t_ds_queue,default queue name : default
974-
INSERT INTO t_ds_version(version) VALUES ('1.4.0');
974+
INSERT INTO t_ds_version(version) VALUES ('3.1.0');
975975

976976
--
977977
-- Table structure for table t_ds_plugin_define
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.1.0

dolphinscheduler-python/pydolphinscheduler/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
logger = logging.getLogger(__name__)
3434

35-
version = "dev"
35+
version = "3.1.0"
3636

3737
# Start package required
3838
prod = [

0 commit comments

Comments
 (0)