From a6db4a591c5ce5ae811b801496d9d55fb5318f99 Mon Sep 17 00:00:00 2001 From: Jiajie Zhong Date: Fri, 5 Aug 2022 16:03:18 +0800 Subject: [PATCH] Some docs version change --- deploy/docker/.env | 2 +- deploy/kubernetes/dolphinscheduler/Chart.yaml | 2 +- .../kubernetes/dolphinscheduler/values.yaml | 2 +- docs/docs/en/guide/expansion-reduction.md | 4 ++-- docs/docs/en/guide/installation/kubernetes.md | 20 +++++++++---------- docs/docs/en/guide/resource/configuration.md | 2 +- docs/docs/en/guide/start/docker.md | 6 +++--- docs/docs/en/history-versions.md | 4 ++-- docs/docs/zh/guide/expansion-reduction.md | 4 ++-- docs/docs/zh/guide/start/docker.md | 6 +++--- docs/docs/zh/history-versions.md | 4 ++-- .../pydolphinscheduler/setup.py | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/deploy/docker/.env b/deploy/docker/.env index efcfc9b91d..231e71a5ee 100755 --- a/deploy/docker/.env +++ b/deploy/docker/.env @@ -16,7 +16,7 @@ # under the License. # HUB=apache -TAG=3.0.0-beta-2 +TAG=3.0.0 TZ=Asia/Shanghai DATABASE=postgresql diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml index f848deca28..0b1a61518b 100644 --- a/deploy/kubernetes/dolphinscheduler/Chart.yaml +++ b/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 # incremented each time you make changes to the application. -appVersion: 3.0.0-beta-2 +appVersion: 3.0.0 dependencies: - name: postgresql diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml index c3da0c47a5..35e05024d2 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.0-beta-2" + tag: "3.0.0" pullPolicy: "IfNotPresent" pullSecret: "" diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md index 22ce52fd04..8b533cf1a4 100644 --- a/docs/docs/en/guide/expansion-reduction.md +++ b/docs/docs/en/guide/expansion-reduction.md @@ -31,9 +31,9 @@ This article describes how to add a new master service or worker service to an e mkdir -p /opt cd /opt # decompress -tar -zxvf apache-dolphinscheduler-3.0.0-beta-2-bin.tar.gz -C /opt +tar -zxvf apache-dolphinscheduler-3.0.0-bin.tar.gz -C /opt cd /opt -mv apache-dolphinscheduler-3.0.0-beta-2-bin dolphinscheduler +mv apache-dolphinscheduler-3.0.0-bin dolphinscheduler ``` ```markdown diff --git a/docs/docs/en/guide/installation/kubernetes.md b/docs/docs/en/guide/installation/kubernetes.md index c56890dbc5..030e3c777e 100644 --- a/docs/docs/en/guide/installation/kubernetes.md +++ b/docs/docs/en/guide/installation/kubernetes.md @@ -12,16 +12,16 @@ If you are a new hand and want to experience DolphinScheduler functions, we reco ## Install DolphinScheduler -Please download the source code package `apache-dolphinscheduler-3.0.0-beta-2-src.tar.gz`, download address: [download address](/en-us/download/download.html) +Please download the source code package `apache-dolphinscheduler-3.0.0-src.tar.gz`, download address: [download address](/en-us/download/download.html) To publish the release name `dolphinscheduler` version, please execute the following commands: ``` -$ tar -zxvf apache-dolphinscheduler-3.0.0-beta-2-src.tar.gz -$ cd apache-dolphinscheduler-3.0.0-beta-2-src/deploy/kubernetes/dolphinscheduler +$ tar -zxvf apache-dolphinscheduler-3.0.0-src.tar.gz +$ cd apache-dolphinscheduler-3.0.0-src/deploy/kubernetes/dolphinscheduler $ helm repo add bitnami https://charts.bitnami.com/bitnami $ helm dependency update . -$ helm install dolphinscheduler . --set image.tag=3.0.0-beta-2 +$ helm install dolphinscheduler . --set image.tag=3.0.0 ``` To publish the release name `dolphinscheduler` version to `test` namespace: @@ -195,9 +195,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names 2. Create a new `Dockerfile` to add MySQL driver: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0 # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.0-beta-2 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.0 # 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 @@ or download the Oracle driver [ojdbc8.jar](https://repo1.maven.org/maven2/com/or 2. Create a new `Dockerfile` to add MySQL or Oracle driver: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0 # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0 # 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.0-beta-2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0 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.0-beta-2 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0 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/resource/configuration.md b/docs/docs/en/guide/resource/configuration.md index 4263354197..42dbd28340 100644 --- a/docs/docs/en/guide/resource/configuration.md +++ b/docs/docs/en/guide/resource/configuration.md @@ -15,7 +15,7 @@ Configure the file in the following paths: `api-server/conf/common.properties` a ## Configuring the common.properties -After version 3.0.0-alpha, if you want to upload resources using HDFS or S3 from the Resource Center, you will need to configure the following paths The following paths need to be configured: `api-server/conf/common.properties` and `worker-server/conf/common.properties`. This can be found as follows. +After version 3.0.0, if you want to upload resources using HDFS or S3 from the Resource Center, you will need to configure the following paths The following paths need to be configured: `api-server/conf/common.properties` and `worker-server/conf/common.properties`. This can be found as follows. ```properties # diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md index 44e1db4d1f..ed7a51b59d 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.0-beta-2 +$ DOLPHINSCHEDULER_VERSION=3.0.0 $ 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.0-beta-2 +$ DOLPHINSCHEDULER_VERSION=3.0.0 $ 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.0-beta-2 +$ DOLPHINSCHEDULER_VERSION=3.0.0 # Initialize the database, make sure database already exists $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ diff --git a/docs/docs/en/history-versions.md b/docs/docs/en/history-versions.md index ee7fbef7db..fd29ea339a 100644 --- a/docs/docs/en/history-versions.md +++ b/docs/docs/en/history-versions.md @@ -4,9 +4,9 @@ #### Setup instructions, are available for each stable version of Apache DolphinScheduler below: -### Versions: 3.0.0-beta-2 +### Versions: 3.0.0 -#### Links： [3.0.0-beta-2 Document](../3.0.0/user_doc/about/introduction.md) +#### Links： [3.0.0 Document](../3.0.0/user_doc/about/introduction.md) ### Versions: 2.0.5 diff --git a/docs/docs/zh/guide/expansion-reduction.md b/docs/docs/zh/guide/expansion-reduction.md index 7504504464..a97f413811 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.0-beta-2-bin.tar.gz -C /opt +tar -zxvf apache-dolphinscheduler-3.0.0-bin.tar.gz -C /opt cd /opt -mv apache-dolphinscheduler-3.0.0-beta-2-bin dolphinscheduler +mv apache-dolphinscheduler-3.0.0-bin dolphinscheduler ``` ```markdown diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index 6ed6b6bd23..f3e0ac8efc 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.0-beta-2 +$ DOLPHINSCHEDULER_VERSION=3.0.0 $ 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.0-beta-2 +$ DOLPHINSCHEDULER_VERSION=3.0.0 $ 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.0-beta-2 +$ DOLPHINSCHEDULER_VERSION=3.0.0 # 初始化数据库，其确保数据库 已经存在 $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ diff --git a/docs/docs/zh/history-versions.md b/docs/docs/zh/history-versions.md index c7202bf710..ceb9f07c88 100644 --- a/docs/docs/zh/history-versions.md +++ b/docs/docs/zh/history-versions.md @@ -3,9 +3,9 @@ # 历史版本： #### 以下是Apache DolphinScheduler每个稳定版本的设置说明。 -### Versions: 3.0.0-beta-2 +### Versions: 3.0.0 -#### Links： [3.0.0-beta-2 文档](../3.0.0/user_doc/about/introduction.md) +#### Links： [3.0.0 文档](../3.0.0/user_doc/about/introduction.md) ### 版本：2.0.5 diff --git a/dolphinscheduler-python/pydolphinscheduler/setup.py b/dolphinscheduler-python/pydolphinscheduler/setup.py index 16f11a2ec2..b1e3742310 100644 --- a/dolphinscheduler-python/pydolphinscheduler/setup.py +++ b/dolphinscheduler-python/pydolphinscheduler/setup.py @@ -32,7 +32,7 @@ if sys.version_info[0] < 3: logger = logging.getLogger(__name__) -version = "3.0.0-beta-2" +version = "3.0.0" # Start package required prod = [