From 7e3ea388e92208a70449cbb51c0ce20ab422ff5f Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Thu, 25 May 2023 19:33:11 +0800 Subject: [PATCH] release: prepare version 3.0.6 --- deploy/docker/.env | 2 +- deploy/kubernetes/dolphinscheduler/Chart.yaml | 4 +- .../kubernetes/dolphinscheduler/values.yaml | 2 +- docs/configs/docsdev.js | 126 +++++++++--------- .../docs/en/contribute/architecture-design.md | 2 +- .../development-environment-setup.md | 2 +- docs/docs/en/contribute/join/pull-request.md | 2 +- docs/docs/en/faq.md | 4 +- docs/docs/en/guide/expansion-reduction.md | 4 +- docs/docs/en/guide/installation/kubernetes.md | 20 +-- docs/docs/en/guide/start/docker.md | 8 +- docs/docs/en/history-versions.md | 4 + .../docs/zh/contribute/architecture-design.md | 2 +- docs/docs/zh/contribute/join/pull-request.md | 2 +- docs/docs/zh/faq.md | 4 +- docs/docs/zh/guide/expansion-reduction.md | 4 +- docs/docs/zh/guide/start/docker.md | 8 +- docs/docs/zh/history-versions.md | 4 + .../resources/sql/dolphinscheduler_h2.sql | 2 +- .../resources/sql/dolphinscheduler_mysql.sql | 2 +- .../sql/dolphinscheduler_postgresql.sql | 2 +- .../src/main/resources/sql/soft_version | 2 +- 22 files changed, 110 insertions(+), 102 deletions(-) diff --git a/deploy/docker/.env b/deploy/docker/.env index a40f0bab82..9105b62ff2 100755 --- a/deploy/docker/.env +++ b/deploy/docker/.env @@ -16,7 +16,7 @@ # under the License. # HUB=apache -TAG=3.0.5 +TAG=3.0.6 TZ=Asia/Shanghai DATABASE=postgresql diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml index c1b2b20f30..3688a8dd50 100644 --- a/deploy/kubernetes/dolphinscheduler/Chart.yaml +++ b/deploy/kubernetes/dolphinscheduler/Chart.yaml @@ -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 diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml index 27a641639e..d4fb19048c 100644 --- a/deploy/kubernetes/dolphinscheduler/values.yaml +++ b/deploy/kubernetes/dolphinscheduler/values.yaml @@ -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: "" diff --git a/docs/configs/docsdev.js b/docs/configs/docsdev.js index d9ff5545b5..256b7f6ac5 100644 --- a/docs/configs/docsdev.js +++ b/docs/configs/docsdev.js @@ -25,19 +25,19 @@ export default { children: [ { title: 'Introduction', - link: '/en-us/docs/3.0.5/user_doc/about/introduction.html', + link: '/en-us/docs/3.0.6/user_doc/about/introduction.html', }, { title: 'Features', - link: '/en-us/docs/3.0.5/user_doc/about/features.html', + link: '/en-us/docs/3.0.6/user_doc/about/features.html', }, { title: 'Hardware Environment', - link: '/en-us/docs/3.0.5/user_doc/about/hardware.html', + link: '/en-us/docs/3.0.6/user_doc/about/hardware.html', }, { title: 'Glossary', - link: '/en-us/docs/3.0.5/user_doc/about/glossary.html', + link: '/en-us/docs/3.0.6/user_doc/about/glossary.html', } ], }, @@ -46,11 +46,11 @@ export default { children: [ { title: 'Quick Start', - link: '/en-us/docs/3.0.5/user_doc/guide/start/quick-start.html', + link: '/en-us/docs/3.0.6/user_doc/guide/start/quick-start.html', }, { title: 'Docker Deployment', - link: '/en-us/docs/3.0.5/user_doc/guide/start/docker.html', + link: '/en-us/docs/3.0.6/user_doc/guide/start/docker.html', }, ], }, @@ -59,30 +59,30 @@ export default { children: [ { title: 'Workflow Overview', - link: '/en-us/docs/3.0.5/user_doc/guide/homepage.html', + link: '/en-us/docs/3.0.6/user_doc/guide/homepage.html', }, { title: 'Project', children: [ { title: 'Project List', - link: '/en-us/docs/3.0.5/user_doc/guide/project/project-list.html', + link: '/en-us/docs/3.0.6/user_doc/guide/project/project-list.html', }, { title: 'Workflow Definition', - link: '/en-us/docs/3.0.5/user_doc/guide/project/workflow-definition.html', + link: '/en-us/docs/3.0.6/user_doc/guide/project/workflow-definition.html', }, { title: 'Workflow Instance', - link: '/en-us/docs/3.0.5/user_doc/guide/project/workflow-instance.html', + link: '/en-us/docs/3.0.6/user_doc/guide/project/workflow-instance.html', }, { title: 'Task Instance', - link: '/en-us/docs/3.0.5/user_doc/guide/project/task-instance.html', + link: '/en-us/docs/3.0.6/user_doc/guide/project/task-instance.html', }, { title: 'Task Definition', - link: '/zh-cn/docs/3.0.5/user_doc/guide/project/task-definition.html', + link: '/zh-cn/docs/3.0.6/user_doc/guide/project/task-definition.html', }, ] }, @@ -91,67 +91,67 @@ export default { children: [ { title: 'Shell', - link: '/en-us/docs/3.0.5/user_doc/guide/task/shell.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/shell.html', }, { title: 'SubProcess', - link: '/en-us/docs/3.0.5/user_doc/guide/task/sub-process.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/sub-process.html', }, { title: 'Dependent', - link: '/en-us/docs/3.0.5/user_doc/guide/task/dependent.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/dependent.html', }, { title: 'Stored Procedure', - link: '/en-us/docs/3.0.5/user_doc/guide/task/stored-procedure.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/stored-procedure.html', }, { title: 'SQL', - link: '/en-us/docs/3.0.5/user_doc/guide/task/sql.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/sql.html', }, { title: 'Spark', - link: '/en-us/docs/3.0.5/user_doc/guide/task/spark.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/spark.html', }, { title: 'MapReduce', - link: '/en-us/docs/3.0.5/user_doc/guide/task/map-reduce.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/map-reduce.html', }, { title: 'Python', - link: '/en-us/docs/3.0.5/user_doc/guide/task/python.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/python.html', }, { title: 'Flink', - link: '/en-us/docs/3.0.5/user_doc/guide/task/flink.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/flink.html', }, { title: 'HTTP', - link: '/en-us/docs/3.0.5/user_doc/guide/task/http.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/http.html', }, { title: 'DataX', - link: '/en-us/docs/3.0.5/user_doc/guide/task/datax.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/datax.html', }, { title: 'Pigeon', - link: '/en-us/docs/3.0.5/user_doc/guide/task/pigeon.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/pigeon.html', }, { title: 'Conditions', - link: '/en-us/docs/3.0.5/user_doc/guide/task/conditions.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/conditions.html', }, { title: 'Switch', - link: '/en-us/docs/3.0.5/user_doc/guide/task/switch.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/switch.html', }, { title: 'Amazon EMR', - link: '/en-us/docs/3.0.5/user_doc/guide/task/emr.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/emr.html', }, { title: 'Apache Zeppelin', - link: '/en-us/docs/3.0.5/user_doc/guide/task/zeppelin.html', + link: '/en-us/docs/3.0.6/user_doc/guide/task/zeppelin.html', }, ], }, @@ -160,23 +160,23 @@ export default { children: [ { title: 'Built-in Parameter', - link: '/en-us/docs/3.0.5/user_doc/guide/parameter/built-in.html', + link: '/en-us/docs/3.0.6/user_doc/guide/parameter/built-in.html', }, { title: 'Global Parameter', - link: '/en-us/docs/3.0.5/user_doc/guide/parameter/global.html', + link: '/en-us/docs/3.0.6/user_doc/guide/parameter/global.html', }, { title: 'Local Parameter', - link: '/en-us/docs/3.0.5/user_doc/guide/parameter/local.html', + link: '/en-us/docs/3.0.6/user_doc/guide/parameter/local.html', }, { title: 'Parameter Context', - link: '/en-us/docs/3.0.5/user_doc/guide/parameter/context.html', + link: '/en-us/docs/3.0.6/user_doc/guide/parameter/context.html', }, { title: 'Parameter Priority', - link: '/en-us/docs/3.0.5/user_doc/guide/parameter/priority.html', + link: '/en-us/docs/3.0.6/user_doc/guide/parameter/priority.html', }, ], }, @@ -185,43 +185,43 @@ export default { children: [ { title: 'MySQL', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/mysql.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/mysql.html', }, { title: 'PostgreSQL', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/postgresql.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/postgresql.html', }, { title: 'HIVE', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/hive.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/hive.html', }, { title: 'Spark', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/spark.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/spark.html', }, { title: 'Presto', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/presto.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/presto.html', }, { title: 'SQL SERVER', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/sqlserver.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/sqlserver.html', }, { title: 'Amazon Redshift', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/redshift.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/redshift.html', }, { title: 'ClickHouse', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/clickhouse.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/clickhouse.html', }, { title: 'IBM DB2', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/db2.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/db2.html', }, { title: 'Oracle', - link: '/en-us/docs/3.0.5/user_doc/guide/datasource/oracle.html', + link: '/en-us/docs/3.0.6/user_doc/guide/datasource/oracle.html', }, ], }, @@ -230,39 +230,39 @@ export default { children: [ { title: 'Alert Component User Guide ', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/alert_plugin_user_guide.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/alert_plugin_user_guide.html', }, { title: 'Email', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/email.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/email.html', }, { title: 'Telegram', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/telegram.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/telegram.html', }, { title: 'Ding Talk', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/dingtalk.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/dingtalk.html', }, { title: 'Enterprise Wechat', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/enterprise-wechat.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/enterprise-wechat.html', }, { title: 'Enterprise Webexteams', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/enterprise-webexteams.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/enterprise-webexteams.html', }, { title: 'Script', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/script.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/script.html', }, { title: 'Http', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/http.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/http.html', }, { title: 'Feishu', - link: '/en-us/docs/3.0.5/user_doc/guide/alert/feishu.html', + link: '/en-us/docs/3.0.6/user_doc/guide/alert/feishu.html', }, { title: 'Slack', @@ -279,54 +279,54 @@ export default { children: [ { title: 'Introduction', - link: '/en-us/docs/3.0.5/user_doc/guide/resource/intro.html' + link: '/en-us/docs/3.0.6/user_doc/guide/resource/intro.html' }, { title: 'Configuration', - link: '/en-us/docs/3.0.5/user_doc/guide/resource/configuration.html' + link: '/en-us/docs/3.0.6/user_doc/guide/resource/configuration.html' }, { title: 'File Manage', - link: '/en-us/docs/3.0.5/user_doc/guide/resource/file-manage.html' + link: '/en-us/docs/3.0.6/user_doc/guide/resource/file-manage.html' }, { title: 'UDF Manage', - link: '/en-us/docs/3.0.5/user_doc/guide/resource/udf-manage.html' + link: '/en-us/docs/3.0.6/user_doc/guide/resource/udf-manage.html' }, { title: 'Task Group Manage', - link: '/en-us/docs/3.0.5/user_doc/guide/resource/task-group.html' + link: '/en-us/docs/3.0.6/user_doc/guide/resource/task-group.html' }, ], }, { title: 'Monitor', - link: '/en-us/docs/3.0.5/user_doc/guide/monitor.html', + link: '/en-us/docs/3.0.6/user_doc/guide/monitor.html', }, { title: 'Security', - link: '/en-us/docs/3.0.5/user_doc/guide/security.html', + link: '/en-us/docs/3.0.6/user_doc/guide/security.html', }, { title: 'Metrics', children: [ { title: 'Metrics', - link: '/en-us/docs/3.0.5/user_doc/guide/metrics/metrics.html', + link: '/en-us/docs/3.0.6/user_doc/guide/metrics/metrics.html', } ], }, { title: 'Data Quality', - link: '/en-us/docs/3.0.5/user_doc/guide/data-quality.html', + link: '/en-us/docs/3.0.6/user_doc/guide/data-quality.html', }, { title: 'Upgrade', - link: '/en-us/docs/3.0.5/user_doc/guide/upgrade.html', + link: '/en-us/docs/3.0.6/user_doc/guide/upgrade.html', }, { title: 'Expansion and Reduction', - link: '/en-us/docs/3.0.5/user_doc/guide/expansion-reduction.html', + link: '/en-us/docs/3.0.6/user_doc/guide/expansion-reduction.html', }, ], }, diff --git a/docs/docs/en/contribute/architecture-design.md b/docs/docs/en/contribute/architecture-design.md index e49df20f25..3ce72fb017 100644 --- a/docs/docs/en/contribute/architecture-design.md +++ b/docs/docs/en/contribute/architecture-design.md @@ -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 diff --git a/docs/docs/en/contribute/development-environment-setup.md b/docs/docs/en/contribute/development-environment-setup.md index 6dabe11597..ea26373d9a 100644 --- a/docs/docs/en/contribute/development-environment-setup.md +++ b/docs/docs/en/contribute/development-environment-setup.md @@ -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 diff --git a/docs/docs/en/contribute/join/pull-request.md b/docs/docs/en/contribute/join/pull-request.md index 0437f3fdce..cb60a762e6 100644 --- a/docs/docs/en/contribute/join/pull-request.md +++ b/docs/docs/en/contribute/join/pull-request.md @@ -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 diff --git a/docs/docs/en/faq.md b/docs/docs/en/faq.md index 8f5f340bdb..6a32b90932 100644 --- a/docs/docs/en/faq.md +++ b/docs/docs/en/faq.md @@ -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 diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md index 60116b18ae..06b0242e11 100644 --- a/docs/docs/en/guide/expansion-reduction.md +++ b/docs/docs/en/guide/expansion-reduction.md @@ -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 diff --git a/docs/docs/en/guide/installation/kubernetes.md b/docs/docs/en/guide/installation/kubernetes.md index d040e30a29..21f44bf283 100644 --- a/docs/docs/en/guide/installation/kubernetes.md +++ b/docs/docs/en/guide/installation/kubernetes.md @@ -17,11 +17,11 @@ Please download the source code package `apache-dolphinscheduler--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: @@ -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-` 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-:3.0.5 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-: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 @@ -246,9 +246,9 @@ externalDatabase: 2. Create a new `Dockerfile` to add MySQL or Oracle driver: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.5 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-: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 @@ -278,7 +278,7 @@ docker build -t apache/dolphinscheduler-: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 && \ @@ -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/* diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md index 467b167387..84a2f39519 100644 --- a/docs/docs/en/guide/start/docker.md +++ b/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. ```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}" ``` @@ -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 @@ -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 already exists $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ @@ -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) +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) and change them if you want. diff --git a/docs/docs/en/history-versions.md b/docs/docs/en/history-versions.md index 1d4739fe61..6a81854be4 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.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) diff --git a/docs/docs/zh/contribute/architecture-design.md b/docs/docs/zh/contribute/architecture-design.md index 7664e988a2..7247d454d7 100644 --- a/docs/docs/zh/contribute/architecture-design.md +++ b/docs/docs/zh/contribute/architecture-design.md @@ -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 架构设计思想 diff --git a/docs/docs/zh/contribute/join/pull-request.md b/docs/docs/zh/contribute/join/pull-request.md index 4ab10544b7..c5c76b2697 100644 --- a/docs/docs/zh/contribute/join/pull-request.md +++ b/docs/docs/zh/contribute/join/pull-request.md @@ -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，请参照下图完成其配置 diff --git a/docs/docs/zh/faq.md b/docs/docs/zh/faq.md index 218f0ad0b7..86c9582050 100644 --- a/docs/docs/zh/faq.md +++ b/docs/docs/zh/faq.md @@ -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，复制正在运行的服务器上的部署目录到新机器的同样的部署目录下 diff --git a/docs/docs/zh/guide/expansion-reduction.md b/docs/docs/zh/guide/expansion-reduction.md index 829b8844b3..52d201f552 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-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 diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index 3fb98e8f94..bb3c4a1634 100644 --- a/docs/docs/zh/guide/start/docker.md +++ b/docs/docs/zh/guide/start/docker.md @@ -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}" ``` @@ -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 @@ -65,7 +65,7 @@ $ docker-compose --profile all up -d ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 DolphinScheduler 容器。 ```shell -$ DOLPHINSCHEDULER_VERSION=3.0.5 +$ DOLPHINSCHEDULER_VERSION=3.0.6 # 初始化数据库，其确保数据库 已经存在 $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ @@ -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) 了解 +注册中心配置，关于全部的配置环境可以查看[全部的配置文件](https://github.com/apache/dolphinscheduler/blob/3.0.6/script/env/dolphinscheduler_env.sh) 了解 diff --git a/docs/docs/zh/history-versions.md b/docs/docs/zh/history-versions.md index 62ddd9f675..03420166ad 100644 --- a/docs/docs/zh/history-versions.md +++ b/docs/docs/zh/history-versions.md @@ -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) diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql index 17f3a9ad52..1efca426db 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql @@ -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'); -- ---------------------------- diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql index 54bdb9a7f1..edeb6140c2 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql @@ -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'); -- ---------------------------- diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql index c63ef1a744..fc6f07fe84 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql @@ -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 diff --git a/dolphinscheduler-dao/src/main/resources/sql/soft_version b/dolphinscheduler-dao/src/main/resources/sql/soft_version index eca690e737..818bd47abf 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/soft_version +++ b/dolphinscheduler-dao/src/main/resources/sql/soft_version @@ -1 +1 @@ -3.0.5 +3.0.6