From 331f68e5b8cce38263e7e54e7635cad49fd770e3 Mon Sep 17 00:00:00 2001 From: devosend Date: Mon, 27 Jun 2022 15:24:08 +0800 Subject: [PATCH] [chore] pre-release 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/start/docker.md | 6 +++--- docs/docs/en/history-versions.md | 4 ++-- docs/docs/zh/guide/expansion-reduction.md | 4 ++-- docs/docs/zh/guide/installation/kubernetes.md | 20 +++++++++---------- docs/docs/zh/guide/start/docker.md | 6 +++--- docs/docs/zh/history-versions.md | 4 ++-- .../pydolphinscheduler/setup.py | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/deploy/docker/.env b/deploy/docker/.env index 04b44500b..efcfc9b91 100755 --- a/deploy/docker/.env +++ b/deploy/docker/.env @@ -16,7 +16,7 @@ # under the License. # HUB=apache -TAG=3.0.0-beta-1 +TAG=3.0.0-beta-2 TZ=Asia/Shanghai DATABASE=postgresql diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml index cf93992d6..9807c16f0 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-1 +appVersion: 3.0.0-beta-2 dependencies: - name: postgresql diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml index 2e9432a0e..fd07fc874 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-1" + tag: "3.0.0-beta-2" pullPolicy: "IfNotPresent" pullSecret: "" diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md index 0778584d4..a379e9cdf 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-1-bin.tar.gz -C /opt +tar -zxvf apache-dolphinscheduler-3.0.0-beta-2-bin.tar.gz -C /opt cd /opt -mv apache-dolphinscheduler-3.0.0-beta-1-bin dolphinscheduler +mv apache-dolphinscheduler-3.0.0-beta-2-bin dolphinscheduler ``` ```markdown diff --git a/docs/docs/en/guide/installation/kubernetes.md b/docs/docs/en/guide/installation/kubernetes.md index 9a05f2429..8ce3998c0 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-1-src.tar.gz`, download address: [download address](/en-us/download/download.html) +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) To publish the release name `dolphinscheduler` version, please execute the following commands: ``` -$ tar -zxvf apache-dolphinscheduler-3.0.0-beta-1-src.tar.gz -$ cd apache-dolphinscheduler-3.0.0-beta-1-src/deploy/kubernetes/dolphinscheduler +$ tar -zxvf apache-dolphinscheduler-3.0.0-beta-2-src.tar.gz +$ cd apache-dolphinscheduler-3.0.0-beta-2-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-1 +$ helm install dolphinscheduler . --set image.tag=3.0.0-beta-2 ``` 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-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-2 # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.0-beta-1 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.0-beta-2 COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib ``` @@ -243,9 +243,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-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-2 # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-1 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 # If you want to support MySQL Datasource COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib @@ -275,7 +275,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-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 COPY requirements.txt /tmp RUN apt-get update && \ apt-get install -y --no-install-recommends python-pip && \ @@ -310,7 +310,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-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 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 b12378f9c..fadd629a5 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-1 +$ DOLPHINSCHEDULER_VERSION=3.0.0-beta-2 $ 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-1 +$ DOLPHINSCHEDULER_VERSION=3.0.0-beta-2 $ 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-1 +$ DOLPHINSCHEDULER_VERSION=3.0.0-beta-2 # 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 41cd736ee..ee7fbef7d 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-1 +### Versions: 3.0.0-beta-2 -#### Links： [3.0.0-beta-1 Document](../3.0.0/user_doc/about/introduction.md) +#### Links： [3.0.0-beta-2 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 671dba02c..7ebff40b5 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-1-bin.tar.gz -C /opt +tar -zxvf apache-dolphinscheduler-3.0.0-beta-2-bin.tar.gz -C /opt cd /opt -mv apache-dolphinscheduler-3.0.0-beta-1-bin dolphinscheduler +mv apache-dolphinscheduler-3.0.0-beta-2-bin dolphinscheduler ``` ```markdown diff --git a/docs/docs/zh/guide/installation/kubernetes.md b/docs/docs/zh/guide/installation/kubernetes.md index bc058e951..ef074fffb 100644 --- a/docs/docs/zh/guide/installation/kubernetes.md +++ b/docs/docs/zh/guide/installation/kubernetes.md @@ -13,16 +13,16 @@ Kubernetes部署目的是在Kubernetes集群中部署 DolphinScheduler 服务， ## 安装 dolphinscheduler -请下载源码包 apache-dolphinscheduler-3.0.0-beta-1-src.tar.gz，下载地址: [下载](/zh-cn/download/download.html) +请下载源码包 apache-dolphinscheduler-3.0.0-beta-2-src.tar.gz，下载地址: [下载](/zh-cn/download/download.html) 发布一个名为 `dolphinscheduler` 的版本(release)，请执行以下命令： ``` -$ tar -zxvf apache-dolphinscheduler-3.0.0-beta-1-src.tar.gz -$ cd apache-dolphinscheduler-3.0.0-beta-1-src/deploy/kubernetes/dolphinscheduler +$ tar -zxvf apache-dolphinscheduler-3.0.0-beta-2-src.tar.gz +$ cd apache-dolphinscheduler-3.0.0-beta-2-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-1 +$ helm install dolphinscheduler . --set image.tag=3.0.0-beta-2 ``` 将名为 `dolphinscheduler` 的版本(release) 发布到 `test` 的命名空间中： @@ -196,9 +196,9 @@ kubectl scale --replicas=6 sts dolphinscheduler-worker -n test # with test names 2. 创建一个新的 `Dockerfile`，用于添加 MySQL 的驱动包: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-2 # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.0-beta-1 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-tools:3.0.0-beta-2 COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib ``` @@ -244,9 +244,9 @@ externalDatabase: 3. 创建一个新的 `Dockerfile`，用于添加 MySQL 或者 Oracle 驱动包: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-:3.0.0-beta-2 # For example -# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-1 +# FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 # If you want to support MySQL Datasource COPY mysql-connector-java-8.0.16.jar /opt/dolphinscheduler/lib @@ -276,7 +276,7 @@ docker build -t apache/dolphinscheduler-:new-driver . 1. 创建一个新的 `Dockerfile`，用于安装 pip: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 COPY requirements.txt /tmp RUN apt-get update && \ apt-get install -y --no-install-recommends python-pip && \ @@ -311,7 +311,7 @@ docker build -t apache/dolphinscheduler-worker:pip . 1. 创建一个新的 `Dockerfile`，用于安装 Python 3: ``` -FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-1 +FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-worker:3.0.0-beta-2 RUN apt-get update && \ apt-get install -y --no-install-recommends python3 && \ rm -rf /var/lib/apt/lists/* diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index 193a3ec3e..d346a51c0 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-1 +$ DOLPHINSCHEDULER_VERSION=3.0.0-beta-2 $ 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-1 +$ DOLPHINSCHEDULER_VERSION=3.0.0-beta-2 $ 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-1 +$ DOLPHINSCHEDULER_VERSION=3.0.0-beta-2 # 初始化数据库，其确保数据库 已经存在 $ 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 e1344834a..c7202bf71 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-1 +### Versions: 3.0.0-beta-2 -#### Links： [3.0.0-beta-1 文档](../3.0.0/user_doc/about/introduction.md) +#### Links： [3.0.0-beta-2 文档](../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 3152c3082..ee48de9b5 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-1" +version = "3.0.0-beta-2" # Start package required prod = [ -- GitLab