github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[chore] pre-release change

3.0.0/version-upgrade
devosend 3 years ago
parent
443f0d74b8
commit
331f68e5b8
12 changed files with 38 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      deploy/docker/.env
  2. 2
      deploy/kubernetes/dolphinscheduler/Chart.yaml
  3. 2
      deploy/kubernetes/dolphinscheduler/values.yaml
  4. 4
      docs/docs/en/guide/expansion-reduction.md
  5. 20
      docs/docs/en/guide/installation/kubernetes.md
  6. 6
      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. 20
      docs/docs/zh/guide/installation/kubernetes.md
  10. 6
      docs/docs/zh/guide/start/docker.md
  11. 4
      docs/docs/zh/history-versions.md
  12. 2
      dolphinscheduler-python/pydolphinscheduler/setup.py

2
deploy/docker/.env
Unescape View File

@ -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

2
deploy/kubernetes/dolphinscheduler/Chart.yaml
Unescape View File

@ -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

2
deploy/kubernetes/dolphinscheduler/values.yaml
Unescape View File

@ -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: ""

4
docs/docs/en/guide/expansion-reduction.md
Unescape View File

@ -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

20
docs/docs/en/guide/installation/kubernetes.md
Unescape View File

@ -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-<service>:3.0.0-beta-1
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>: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-<service>:3.0.0-beta-1
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>: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-<service>: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/*

6
docs/docs/en/guide/start/docker.md
Unescape View File

@ -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 <DATABASE> already exists
$ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \

4
docs/docs/en/history-versions.md
Unescape View File

@ -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

4
docs/docs/zh/guide/expansion-reduction.md
Unescape View File

@ -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

20
docs/docs/zh/guide/installation/kubernetes.md
Unescape View File

@ -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-<service>:3.0.0-beta-1
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>: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-<service>:3.0.0-beta-1
FROM dolphinscheduler.docker.scarf.sh/apache/dolphinscheduler-<service>: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-<service>: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/*

6
docs/docs/zh/guide/start/docker.md
Unescape View File

@ -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
# 初始化数据库，其确保数据库 <DATABASE> 已经存在
$ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \

4
docs/docs/zh/history-versions.md
Unescape View File

@ -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

2
dolphinscheduler-python/pydolphinscheduler/setup.py
Unescape View File

@ -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 = [

Write Preview
Loading…
Cancel
Save