Browse Source

[3.1.0-prepare] Update version to 310 (#12146)

Co-authored-by: Jiajie Zhong <zhongjiajie955@gmail.com>
3.1.0-release
caishunfeng 2 years ago committed by GitHub
parent
commit
f982e1d2a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      deploy/docker/.env
  2. 2
      deploy/kubernetes/dolphinscheduler/Chart.yaml
  3. 2
      deploy/kubernetes/dolphinscheduler/values.yaml
  4. 488
      docs/configs/docsdev.js
  5. 4
      docs/docs/en/guide/expansion-reduction.md
  6. 8
      docs/docs/en/guide/start/docker.md
  7. 4
      docs/docs/en/history-versions.md
  8. 4
      docs/docs/zh/guide/expansion-reduction.md
  9. 12
      docs/docs/zh/guide/start/docker.md
  10. 4
      docs/docs/zh/history-versions.md
  11. 2
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
  12. 2
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
  13. 2
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
  14. 2
      dolphinscheduler-dao/src/main/resources/sql/soft_version
  15. 2
      dolphinscheduler-python/pydolphinscheduler/setup.py

4
deploy/docker/.env

@ -15,8 +15,8 @@
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
# #
HUB=ghcr.io/apache/dolphinscheduler HUB=apache
TAG=latest TAG=3.1.0
TZ=Asia/Shanghai TZ=Asia/Shanghai
DATABASE=postgresql DATABASE=postgresql

2
deploy/kubernetes/dolphinscheduler/Chart.yaml

@ -39,7 +39,7 @@ version: 2.0.0
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: dev-SNAPSHOT appVersion: 3.1.0
dependencies: dependencies:
- name: postgresql - name: postgresql

2
deploy/kubernetes/dolphinscheduler/values.yaml

@ -23,7 +23,7 @@ timezone: "Asia/Shanghai"
image: image:
registry: "dolphinscheduler.docker.scarf.sh/apache" registry: "dolphinscheduler.docker.scarf.sh/apache"
tag: "dev-SNAPSHOT" tag: "3.1.0"
pullPolicy: "IfNotPresent" pullPolicy: "IfNotPresent"
pullSecret: "" pullSecret: ""

488
docs/configs/docsdev.js

File diff suppressed because it is too large Load Diff

4
docs/docs/en/guide/expansion-reduction.md

@ -30,9 +30,9 @@ Attention: DolphinScheduler itself does not depend on Hadoop, Hive, Spark, but w
mkdir -p /opt mkdir -p /opt
cd /opt cd /opt
# decompress # decompress
tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt tar -zxvf apache-dolphinscheduler-3.1.0-bin.tar.gz -C /opt
cd /opt cd /opt
mv apache-dolphinscheduler-<version>-bin dolphinscheduler mv apache-dolphinscheduler-3.1.0-bin dolphinscheduler
``` ```
```markdown ```markdown

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

@ -19,7 +19,7 @@ Start DolphinScheduler with standalone-server Docker images is the easiest way t
you can learn DolphinScheduler's concepts and usage, with minimal cost. you can learn DolphinScheduler's concepts and usage, with minimal cost.
```shell ```shell
$ DOLPHINSCHEDULER_VERSION=<version> $ DOLPHINSCHEDULER_VERSION=3.1.0
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}" $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
``` ```
@ -49,7 +49,7 @@ After complete the configuration, we can get the `docker-compose.yaml` file from
form its source package, and make sure you get the right version. After download the package, you can run the commands as below. form its source package, and make sure you get the right version. After download the package, you can run the commands as below.
```shell ```shell
$ DOLPHINSCHEDULER_VERSION=<version> $ DOLPHINSCHEDULER_VERSION=3.1.0
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
# Going to docker-compose's location # Going to docker-compose's location
# For Mac or Linux users # For Mac or Linux users
@ -72,7 +72,7 @@ $ docker-compose --profile all up -d
container when it up. You could start DolphinScheduler server separately if you want to reuse your exists services. container when it up. You could start DolphinScheduler server separately if you want to reuse your exists services.
```shell ```shell
$ DOLPHINSCHEDULER_VERSION=<version> $ DOLPHINSCHEDULER_VERSION=3.1.0
# Initialize the database, make sure database <DATABASE> already exists # Initialize the database, make sure database <DATABASE> already exists
$ docker run -d --name dolphinscheduler-tools \ $ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
@ -133,5 +133,5 @@ and use `admin` and `dolphinscheduler123` as default username and password in th
You can modify some environment variables to change configurations when you are starting servers through Docker. We have You can modify some environment variables to change configurations when you are starting servers through Docker. We have
an example in [using exists PostgreSQL ZooKeeper](#using-exists-postgresql-zookeeper) to change database and ZooKeeper configurations, an example in [using exists PostgreSQL ZooKeeper](#using-exists-postgresql-zookeeper) to change database and ZooKeeper configurations,
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 --> 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 -->
and change them if you want. and change them if you want.

4
docs/docs/en/history-versions.md

@ -4,6 +4,10 @@
#### Setup instructions, are available for each stable version of Apache DolphinScheduler below: #### Setup instructions, are available for each stable version of Apache DolphinScheduler below:
### Versions: 3.1.0
#### Links: [3.1.0 Document](../3.1.0/user_doc/about/introduction.md)
### Versions: 3.0.0 ### Versions: 3.0.0
#### Links: [3.0.0 Document](../3.0.0/user_doc/about/introduction.md) #### Links: [3.0.0 Document](../3.0.0/user_doc/about/introduction.md)

4
docs/docs/zh/guide/expansion-reduction.md

@ -30,9 +30,9 @@
mkdir -p /opt mkdir -p /opt
cd /opt cd /opt
# 解压缩 # 解压缩
tar -zxvf apache-dolphinscheduler-<version>-bin.tar.gz -C /opt tar -zxvf apache-dolphinscheduler-3.1.0-bin.tar.gz -C /opt
cd /opt cd /opt
mv apache-dolphinscheduler-<version>-bin dolphinscheduler mv apache-dolphinscheduler-3.1.0-bin dolphinscheduler
``` ```
```markdown ```markdown

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

@ -2,7 +2,7 @@
本教程使用三种不同的方式通过 Docker 完成 DolphinScheduler 的部署,如果你想要快速体验,推荐使用 standalone-server 镜像, 本教程使用三种不同的方式通过 Docker 完成 DolphinScheduler 的部署,如果你想要快速体验,推荐使用 standalone-server 镜像,
如果你想要体验比较完成的服务,推荐使用 docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务 如果你想要体验比较完成的服务,推荐使用 docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务
你想要沿用这些基础服务,你可以参考沿用已有的 PostgreSQL 和 ZooKeeper 服务完成部署。 你想要沿用这些基础服务,你可以参考沿用已有的 PostgreSQL 和 ZooKeeper 服务完成部署。
## 前置条件 ## 前置条件
@ -17,7 +17,7 @@
你可以最快速的体验到 DolphinScheduler 的大部分功能,了解主要和概念和内容。 你可以最快速的体验到 DolphinScheduler 的大部分功能,了解主要和概念和内容。
```shell ```shell
$ DOLPHINSCHEDULER_VERSION=<version> $ DOLPHINSCHEDULER_VERSION=3.1.0
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}" $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
``` ```
@ -43,7 +43,7 @@ $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:2
源码包对应的值为 "Total Source Code"。当下载完源码后就可以运行命令进行部署了。 源码包对应的值为 "Total Source Code"。当下载完源码后就可以运行命令进行部署了。
```shell ```shell
$ DOLPHINSCHEDULER_VERSION=<version> $ DOLPHINSCHEDULER_VERSION=3.1.0
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
# Mac Linux 用户 # Mac Linux 用户
$ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker $ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker
@ -56,7 +56,7 @@ $ docker-compose --profile schema up -d
$ docker-compose --profile all up -d $ docker-compose --profile all up -d
``` ```
> 提醒:通过 docker-compose 启动服务时,除了会启动 DolphinScheduler 对应的服务外,还会启动必要依赖服务,如数据库 PostgreSQL(用户 > 提醒:通过 docker-compose 启动服务时,除了会启动 DolphinScheduler 对应的服务外,还会启动必要依赖服务,如数据库 PostgreSQL(用户
> `root`, 密码 `root`, 数据库 `dolphinscheduler`) 和 服务发现 ZooKeeper。 > `root`, 密码 `root`, 数据库 `dolphinscheduler`) 和 服务发现 ZooKeeper。
### 沿用已有的 PostgreSQL 和 ZooKeeper 服务 ### 沿用已有的 PostgreSQL 和 ZooKeeper 服务
@ -65,7 +65,7 @@ $ docker-compose --profile all up -d
ZooKeeper 且不想启动新的服务,可以使用这个方式分别启动 DolphinScheduler 容器。 ZooKeeper 且不想启动新的服务,可以使用这个方式分别启动 DolphinScheduler 容器。
```shell ```shell
$ DOLPHINSCHEDULER_VERSION=<version> $ DOLPHINSCHEDULER_VERSION=3.1.0
# 初始化数据库,其确保数据库 <DATABASE> 已经存在 # 初始化数据库,其确保数据库 <DATABASE> 已经存在
$ docker run -d --name dolphinscheduler-tools \ $ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
@ -126,4 +126,4 @@ $ docker run -d --name dolphinscheduler-alert-server \
## 环境变量 ## 环境变量
可以通过环境变量来修改 Docker 运行的配置,我们在沿用已有的 PostgreSQL 和 ZooKeeper 服务中就通过环境变量修改了 Docker 的数据库配置和 可以通过环境变量来修改 Docker 运行的配置,我们在沿用已有的 PostgreSQL 和 ZooKeeper 服务中就通过环境变量修改了 Docker 的数据库配置和
注册中心配置,关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/<version>/script/env/dolphinscheduler_env.sh) 了解 <!-- markdown-link-check-disable-line --> 注册中心配置,关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/3.1.0/script/env/dolphinscheduler_env.sh) 了解 <!-- markdown-link-check-disable-line -->

4
docs/docs/zh/history-versions.md

@ -4,6 +4,10 @@
#### 以下是Apache DolphinScheduler每个稳定版本的设置说明。 #### 以下是Apache DolphinScheduler每个稳定版本的设置说明。
### Versions: 3.1.0
#### Links: [3.1.0 文档](../3.1.0/user_doc/about/introduction.md)
### Versions: 3.0.0 ### Versions: 3.0.0
#### Links: [3.0.0 文档](../3.0.0/user_doc/about/introduction.md) #### Links: [3.0.0 文档](../3.0.0/user_doc/about/introduction.md)

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

@ -989,7 +989,7 @@ CREATE TABLE t_ds_version
-- Records of t_ds_version -- Records of t_ds_version
-- ---------------------------- -- ----------------------------
INSERT INTO t_ds_version INSERT INTO t_ds_version
VALUES ('1', '1.4.0'); VALUES ('1', '3.1.0');
-- ---------------------------- -- ----------------------------

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

@ -980,7 +980,7 @@ CREATE TABLE `t_ds_version` (
-- ---------------------------- -- ----------------------------
-- Records of t_ds_version -- Records of t_ds_version
-- ---------------------------- -- ----------------------------
INSERT IGNORE INTO `t_ds_version` VALUES ('1', '2.0.2'); INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.1.0');
-- ---------------------------- -- ----------------------------

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

@ -971,7 +971,7 @@ INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time)
VALUES ('default', 'default', '2018-11-29 10:22:33', '2018-11-29 10:22:33'); VALUES ('default', 'default', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
-- Records of t_ds_queue,default queue name : default -- Records of t_ds_queue,default queue name : default
INSERT INTO t_ds_version(version) VALUES ('1.4.0'); INSERT INTO t_ds_version(version) VALUES ('3.1.0');
-- --
-- Table structure for table t_ds_plugin_define -- Table structure for table t_ds_plugin_define

2
dolphinscheduler-dao/src/main/resources/sql/soft_version

@ -1 +1 @@
3.0.0 3.1.0

2
dolphinscheduler-python/pydolphinscheduler/setup.py

@ -32,7 +32,7 @@ if sys.version_info[0] < 3:
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
version = "dev" version = "3.1.0"
# Start package required # Start package required
prod = [ prod = [

Loading…
Cancel
Save