Skip to content

Commit

Permalink
release: prepare version 3.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
zhongjiajie committed May 25, 2023
1 parent 57fff8c commit 7e3ea38
Show file tree
Hide file tree
Showing 22 changed files with 110 additions and 102 deletions.
2 changes: 1 addition & 1 deletion deploy/docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
#
HUB=apache
TAG=3.0.5
TAG=3.0.6

TZ=Asia/Shanghai
DATABASE=postgresql
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/dolphinscheduler/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 3.0.5
version: 3.0.6

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 3.0.5
appVersion: 3.0.6

dependencies:
- name: postgresql
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/dolphinscheduler/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ timezone: "Asia/Shanghai"

image:
registry: "dolphinscheduler.docker.scarf.sh/apache"
tag: "3.0.5"
tag: "3.0.6"
pullPolicy: "IfNotPresent"
pullSecret: ""

Expand Down
126 changes: 63 additions & 63 deletions docs/configs/docsdev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/docs/en/contribute/architecture-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Before explaining the architecture of the schedule system, let us first understa

- **UI**

The front-end page of the system provides various visual operation interfaces of the system. For details, see the [quick start](https://dolphinscheduler.apache.org/en-us/docs/3.0.5/about/introduction) section.
The front-end page of the system provides various visual operation interfaces of the system. For details, see the [quick start](https://dolphinscheduler.apache.org/en-us/docs/3.0.6/about/introduction) section.

#### 2.3 Architectural Design Ideas

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/en/contribute/development-environment-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ There are two ways to configure the DolphinScheduler development environment, st
>
> Standalone is only supported in DolphinScheduler 1.3.9 and later versions.
>
> Standalone server is able to connect to external databases like mysql and postgresql, see [Standalone Deployment](https://dolphinscheduler.apache.org/en-us/docs/3.0.5/guide/installation/standalone) for instructions.
> Standalone server is able to connect to external databases like mysql and postgresql, see [Standalone Deployment](https://dolphinscheduler.apache.org/en-us/docs/3.0.6/guide/installation/standalone) for instructions.
### Git Branch Choose

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/en/contribute/join/pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Please refer to the commit message section.

Code style is the thing you have to consider when you submit pull request for DolphinScheduler. We using [Checkstyle](https://checkstyle.sourceforge.io), a development tool to help programmers write Java code that adheres to a coding standard, in CI to keep DolphinScheduler codebase in the same style. Your pull request could not be merged if your code style checker failed. You could format your code by *Checkstyle* in your local environment before you submit your pull request to check code style. The activation step as below:

1. Prepare Checkstyle configuration file: You could download it manually by [click here](https://github.com/apache/dolphinscheduler/blob/3.0.5/style/checkstyle.xml), but find it in DolphinScheduler repository would be a better way. You could find configuration file in the path `style/checkstyle.xml` after you clone repository from Github.
1. Prepare Checkstyle configuration file: You could download it manually by [click here](https://github.com/apache/dolphinscheduler/blob/3.0.6/style/checkstyle.xml), but find it in DolphinScheduler repository would be a better way. You could find configuration file in the path `style/checkstyle.xml` after you clone repository from Github.

2. Download Checkstyle plugins in Intellij IDEA: Search plugin by keyword **CheckStyle-IDEA** or install in [this page](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea). You could see [install plugin](https://www.jetbrains.com/help/idea/managing-plugins.html#install_plugin_from_repo) if you do not know how to install plugin in Intellij IDEA

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/en/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ change into

## Q : how to add a worker server

A: 1, Create deployment user and hosts mapping, please refer 1.3 part of [cluster deployment](https://dolphinscheduler.apache.org/en-us/docs/3.0.5/user_doc/installation/cluster)
A: 1, Create deployment user and hosts mapping, please refer 1.3 part of [cluster deployment](https://dolphinscheduler.apache.org/en-us/docs/3.0.6/user_doc/installation/cluster)

​ 2, Configure hosts mapping and ssh access and modify directory permissions. please refer 1.4 part of [cluster deployment](https://dolphinscheduler.apache.org/en-us/docs/3.0.5/user_doc/installation/cluster)
​ 2, Configure hosts mapping and ssh access and modify directory permissions. please refer 1.4 part of [cluster deployment](https://dolphinscheduler.apache.org/en-us/docs/3.0.6/user_doc/installation/cluster)

​ 3, Copy the deployment directory from worker server that has already deployed

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/en/guide/expansion-reduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ Attention: There cannot be more than one master service process or worker servic
mkdir -p /opt
cd /opt
# decompress
tar -zxvf apache-dolphinscheduler-3.0.5-bin.tar.gz -C /opt
tar -zxvf apache-dolphinscheduler-3.0.6-bin.tar.gz -C /opt
cd /opt
mv apache-dolphinscheduler-3.0.5-bin dolphinscheduler
mv apache-dolphinscheduler-3.0.6-bin dolphinscheduler
```

```markdown
Expand Down
20 changes: 10 additions & 10 deletions docs/docs/en/guide/installation/kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ Please download the source code package `apache-dolphinscheduler-<version>-src.t
To publish the release name `dolphinscheduler` version, please execute the following commands:

```
$ tar -zxvf apache-dolphinscheduler-3.0.5-src.tar.gz
$ cd apache-dolphinscheduler-3.0.5-src/deploy/kubernetes/dolphinscheduler
$ tar -zxvf apache-dolphinscheduler-3.0.6-src.tar.gz
$ cd apache-dolphinscheduler-3.0.6-src/deploy/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
$ helm install dolphinscheduler . --set image.tag=3.0.5
$ helm install dolphinscheduler . --set image.tag=3.0.6
```

To publish the release name `dolphinscheduler` version to `test` namespace:
Expand Down Expand Up @@ -188,16 +188,16 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names
>
> If you want to use MySQL, you can build a new image based on the `apache/dolphinscheduler-<service>` image follow the following instructions:
>
> Since version 3.0.5, 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
> Since version 3.0.6, 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
1. Download the MySQL driver [mysql-connector-java-8.0.16.jar](https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar).

2. Create a new `Dockerfile` to add MySQL driver:

```
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.0.5
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.0.6
# For example
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.5
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.6
# Attention Please, If the build is dolphinscheduler-tools image
# You need to change the following line to: COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/tools/libs
Expand Down Expand Up @@ -246,9 +246,9 @@ externalDatabase:
2. Create a new `Dockerfile` to add MySQL or Oracle driver:

```
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.0.5
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>:3.0.6
# For example
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.5
# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.6
# If you want to support MySQL Datasource
COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/libs
Expand Down Expand Up @@ -278,7 +278,7 @@ docker build -t apache/dolphinscheduler-<service>:new-driver .
1. Create a new `Dockerfile` to install pip:

```
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.5
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.6
COPY requirements.txt /tmp
RUN apt-get update && \
apt-get install -y --no-install-recommends python-pip && \
Expand Down Expand Up @@ -313,7 +313,7 @@ docker build -t apache/dolphinscheduler-worker:pip .
1. Create a new `Dockerfile` to install Python 3:
```
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.5
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.6
RUN apt-get update && \
apt-get install -y --no-install-recommends python3 && \
rm -rf /var/lib/apt/lists/*
Expand Down
8 changes: 4 additions & 4 deletions docs/docs/en/guide/start/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

```shell
$ DOLPHINSCHEDULER_VERSION=3.0.5
$ DOLPHINSCHEDULER_VERSION=3.0.6
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
```

Expand Down Expand Up @@ -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.

```shell
$ DOLPHINSCHEDULER_VERSION=3.0.5
$ DOLPHINSCHEDULER_VERSION=3.0.6
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
# Going to docker-compose's location
# For Mac or Linux users
Expand All @@ -73,7 +73,7 @@ container when it up. You could start DolphinScheduler server separately if you


```shell
$ DOLPHINSCHEDULER_VERSION=3.0.5
$ DOLPHINSCHEDULER_VERSION=3.0.6
# Initialize the database, make sure database <DATABASE> already exists
$ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \
Expand Down Expand Up @@ -134,5 +134,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
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/3.0.5/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.0.6/script/env/dolphinscheduler_env.sh) <!-- markdown-link-check-disable-line -->
and change them if you want.
4 changes: 4 additions & 0 deletions docs/docs/en/history-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

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

### Versions: 3.0.6

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

### Versions: 3.0.5

#### Links: [3.0.5 Document](../3.0.5/user_doc/about/introduction.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/zh/contribute/architecture-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@

* **UI**

系统的前端页面,提供系统的各种可视化操作界面,详见 [快速开始](https://dolphinscheduler.apache.org/zh-cn/docs/3.0.5/about/introduction) 部分。
系统的前端页面,提供系统的各种可视化操作界面,详见 [快速开始](https://dolphinscheduler.apache.org/zh-cn/docs/3.0.6/about/introduction) 部分。

#### 2.3 架构设计思想

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/zh/contribute/join/pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ waste time。

当你向 DolphinScheduler 提交 pull request 的时候 code-style 是你不得不考虑的问题。我们在 CI 中使用 Checkstyle [参考](https://checkstyle.sourceforge.io/)来保持代码风格的统一,它是一种帮助开发者编写遵循编码规范的 Java 代码开发工具。如果你的 pull request 没有通过 Checkstyle 的检测,那它将不会被合并到主库中。你可以在提交 pull request 前使用 Checkstyle 来检测或者格式化你的代码。如下的步骤将引领你配置并激活 Checkstyle

1. 准备 Checkstyle 配置文件:你可以点击[这里](https://github.com/apache/dolphinscheduler/blob/3.0.5/style/checkstyle.xml)手动下载,但是我们更加推荐在 DolphinScheduler 代码库中找到它。当你将代码库克隆下来后,你可以在路径 `style/checkstyle.xml` 下找到配置文件
1. 准备 Checkstyle 配置文件:你可以点击[这里](https://github.com/apache/dolphinscheduler/blob/3.0.6/style/checkstyle.xml)手动下载,但是我们更加推荐在 DolphinScheduler 代码库中找到它。当你将代码库克隆下来后,你可以在路径 `style/checkstyle.xml` 下找到配置文件
2. 下载 Intellij IDEA Checkstyle 插件:通过关键字**CheckStyle-IDEA**或者通过[这个页面](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea)安装均可。如果你不清楚如何安装Intellij IDEA插件,可以参考[这个连接](https://www.jetbrains.com/help/idea/managing-plugins.html#install_plugin_from_repo)
3. 配置并激活 Checkstyles 以及 Intellij IDEA 代码风格:当完成上面几步后,你就可以配置并激活他们了。你可以在路径`Preferences -> Tool -> Checkstyle`中找到 Checkstyle,请参照下图完成其配置

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/zh/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ A: 将 hive pom

## Q:如何增加一台工作服务器

A: 1,参考官网[部署文档](https://dolphinscheduler.apache.org/zh-cn/docs/3.0.5/installation/cluster) 1.3 小节,创建部署用户和 hosts 映射
A: 1,参考官网[部署文档](https://dolphinscheduler.apache.org/zh-cn/docs/3.0.6/installation/cluster) 1.3 小节,创建部署用户和 hosts 映射

​ 2,参考官网[部署文档](https://dolphinscheduler.apache.org/zh-cn/docs/3.0.5/installation/cluster) 1.4 小节,配置 hosts 映射和 ssh 打通及修改目录权限.
​ 2,参考官网[部署文档](https://dolphinscheduler.apache.org/zh-cn/docs/3.0.6/installation/cluster) 1.4 小节,配置 hosts 映射和 ssh 打通及修改目录权限.
​ 1.4 小节的最后一步是在当前新增机器上执行的,即需要给部署目录部署用户的权限

​ 3,复制正在运行的服务器上的部署目录到新机器的同样的部署目录下
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/zh/guide/expansion-reduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
mkdir -p /opt
cd /opt
# 解压缩
tar -zxvf apache-dolphinscheduler-3.0.5-bin.tar.gz -C /opt
tar -zxvf apache-dolphinscheduler-3.0.6-bin.tar.gz -C /opt
cd /opt
mv apache-dolphinscheduler-3.0.5-bin dolphinscheduler
mv apache-dolphinscheduler-3.0.6-bin dolphinscheduler
```

```markdown
Expand Down
8 changes: 4 additions & 4 deletions docs/docs/zh/guide/start/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
你可以最快速的体验到 DolphinScheduler 的大部分功能,了解主要和概念和内容。

```shell
$ DOLPHINSCHEDULER_VERSION=3.0.5
$ DOLPHINSCHEDULER_VERSION=3.0.6
$ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
```

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

```shell
$ DOLPHINSCHEDULER_VERSION=3.0.5
$ DOLPHINSCHEDULER_VERSION=3.0.6
$ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
# Mac Linux 用户
$ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker
Expand All @@ -65,7 +65,7 @@ $ docker-compose --profile all up -d
ZooKeeper 且不想启动新的服务,可以使用这个方式分别启动 DolphinScheduler 容器。

```shell
$ DOLPHINSCHEDULER_VERSION=3.0.5
$ DOLPHINSCHEDULER_VERSION=3.0.6
# 初始化数据库,其确保数据库 <DATABASE> 已经存在
$ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \
Expand Down Expand Up @@ -126,4 +126,4 @@ $ docker run -d --name dolphinscheduler-alert-server \
## 环境变量

可以通过环境变量来修改 Docker 运行的配置,我们在沿用已有的 PostgreSQL 和 ZooKeeper 服务中就通过环境变量修改了 Docker 的数据库配置和
注册中心配置,关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/3.0.5/script/env/dolphinscheduler_env.sh) 了解 <!-- markdown-link-check-disable-line -->
注册中心配置,关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/3.0.6/script/env/dolphinscheduler_env.sh) 了解 <!-- markdown-link-check-disable-line -->
4 changes: 4 additions & 0 deletions docs/docs/zh/history-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# 历史版本:
#### 以下是Apache DolphinScheduler每个稳定版本的设置说明。

### Versions: 3.0.6

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

### Versions: 3.0.5

#### Links: [3.0.5 文档](../3.0.5/user_doc/about/introduction.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ CREATE TABLE t_ds_version
-- Records of t_ds_version
-- ----------------------------
INSERT INTO t_ds_version
VALUES ('1', '3.0.5');
VALUES ('1', '3.0.6');


-- ----------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ CREATE TABLE `t_ds_version` (
-- ----------------------------
-- Records of t_ds_version
-- ----------------------------
INSERT INTO `t_ds_version` VALUES ('1', '3.0.5');
INSERT INTO `t_ds_version` VALUES ('1', '3.0.6');


-- ----------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,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');

-- Records of t_ds_queue,default queue name : default
INSERT INTO t_ds_version(version) VALUES ('3.0.5');
INSERT INTO t_ds_version(version) VALUES ('3.0.6');

--
-- Table structure for table t_ds_plugin_define
Expand Down
2 changes: 1 addition & 1 deletion dolphinscheduler-dao/src/main/resources/sql/soft_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.5
3.0.6

0 comments on commit 7e3ea38

Please sign in to comment.