This is an automated email from the ASF dual-hosted git repository.
chengshiwen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new d845072 Improve docker/k8s and latest docs (#340)
d845072 is described below
commit d845072c72aaba4aca0a60860612aafa4eef5c89
Author: Shiwen Cheng <[email protected]>
AuthorDate: Thu Apr 29 15:24:02 2021 +0800
Improve docker/k8s and latest docs (#340)
---
community/en-us/release-post.md | 13 +++++++++++++
community/en-us/release-prepare.md | 9 ++++++---
community/zh-cn/release-post.md | 13 +++++++++++++
community/zh-cn/release-prepare.md | 9 ++++++---
docs/en-us/1.3.4/user_doc/docker-deployment.md | 8 +++++---
docs/en-us/1.3.5/user_doc/docker-deployment.md | 10 ++++++----
docs/en-us/1.3.5/user_doc/kubernetes-deployment.md | 4 ++--
docs/en-us/1.3.6/user_doc/docker-deployment.md | 10 ++++++----
docs/en-us/1.3.6/user_doc/kubernetes-deployment.md | 4 ++--
docs/en-us/1.3.6/user_doc/skywalking-agent-deployment.md | 2 +-
docs/zh-cn/1.3.4/user_doc/docker-deployment.md | 8 +++++---
docs/zh-cn/1.3.5/user_doc/docker-deployment.md | 10 ++++++----
docs/zh-cn/1.3.5/user_doc/kubernetes-deployment.md | 4 ++--
docs/zh-cn/1.3.6/user_doc/docker-deployment.md | 10 ++++++----
docs/zh-cn/1.3.6/user_doc/kubernetes-deployment.md | 4 ++--
docs/zh-cn/1.3.6/user_doc/skywalking-agent-deployment.md | 2 +-
src/components/md2html/index.jsx | 4 ++++
17 files changed, 86 insertions(+), 38 deletions(-)
diff --git a/community/en-us/release-post.md b/community/en-us/release-post.md
index 4afab09..9045aa4 100644
--- a/community/en-us/release-post.md
+++ b/community/en-us/release-post.md
@@ -20,3 +20,16 @@ For example, after the release of `x.y.z`, the following
updates are required:
- `docsxyz`: Add a drop-down menu with `key` as `docsxyz` and `text` as
`x.y.z` in `children` of two places of `en-us/zh-cn`
- `src/pages/docs/index.md.jsx`: Add `'x.y.z': docsxyzConfig,`
- `download/en-us/download.md` and `download/zh-cn/download.md`: add the
download of the x.y.z release package
+
+## Publish Image
+
+Build docker image first, please refer to [How to build a Docker
image?](/en-us/docs/latest/user_doc/docker-deployment.html)
+
+And then publish image
+
+```bash
+docker tag apache/dolphinscheduler:x.y.z apache/dolphinscheduler:latest
+docker login # enter the username and password
+docker push apache/dolphinscheduler:x.y.z
+docker push apache/dolphinscheduler:latest
+```
diff --git a/community/en-us/release-prepare.md
b/community/en-us/release-prepare.md
index 8abd9ac..deaf598 100644
--- a/community/en-us/release-prepare.md
+++ b/community/en-us/release-prepare.md
@@ -23,6 +23,9 @@ For example, to release `x.y.z`, the following updates are
required:
- `dolphinscheduler_postgre.sql`: `t_ds_version` needs to be updated to
x.y.z
- `upgrade`: whether to add`x.y.z_schema`
- `soft_version`: need to be updated to x.y.z
- - `docker/kubernetes/dolphinscheduler/Chart.yaml`:
- - `version`: helm chart version needs to be updated, different from x.y.z
- - `appVersion`: need to be updated to x.y.z
+ - `docker/docker-swarm`:
+ - `docker-compose.yml`: `image: apache/dolphinscheduler` needs to be
updated to x.y.z
+ - `docker-stack.yml`: `image: apache/dolphinscheduler` needs to be updated
to x.y.z
+ - `docker/kubernetes/dolphinscheduler`:
+ - `Chart.yaml`: `appVersion` needs to be updated to x.y.z (`version` is
helm chart version，incremented and different from x.y.z)
+ - `values.yaml`: `image.tag` needs to be updated to x.y.z
diff --git a/community/zh-cn/release-post.md b/community/zh-cn/release-post.md
index 51ff3c5..db39e7a 100644
--- a/community/zh-cn/release-post.md
+++ b/community/zh-cn/release-post.md
@@ -20,3 +20,16 @@
- `docsxyz`: 两处 `en-us/zh-cn` 的 `children` 增加 `key` 为 `docsxyz`, `text` 为
`x.y.z` 的下拉菜单
- `src/pages/docs/index.md.jsx`: 增加 `'x.y.z': docsxyzConfig,`
- `download/en-us/download.md` 和 `download/zh-cn/download.md`: 增加 x.y.z
版本发布包的下载
+
+## 发布镜像
+
+构建 Docker 镜像，请参考 [如何构建一个 Docker
镜像？](/zh-cn/docs/latest/user_doc/docker-deployment.html)
+
+然后推送镜像
+
+```bash
+docker tag apache/dolphinscheduler:x.y.z apache/dolphinscheduler:latest
+docker login # 输入用户和密码
+docker push apache/dolphinscheduler:x.y.z
+docker push apache/dolphinscheduler:latest
+```
diff --git a/community/zh-cn/release-prepare.md
b/community/zh-cn/release-prepare.md
index f7d75ef..739edcc 100644
--- a/community/zh-cn/release-prepare.md
+++ b/community/zh-cn/release-prepare.md
@@ -23,6 +23,9 @@
- `dolphinscheduler_postgre.sql`: `t_ds_version` 版本更新为 x.y.z
- `upgrade`: 是否新增 `x.y.z_schema`
- `soft_version`: 版本更新为 x.y.z
- - `docker/kubernetes/dolphinscheduler/Chart.yaml`:
- - `version`: helm chart 版本更新，不要设置为 x.y.z
- - `appVersion`: 版本更新为 x.y.z
+ - `docker/docker-swarm`:
+ - `docker-compose.yml`: `image: apache/dolphinscheduler` 版本更新为 x.y.z
+ - `docker-stack.yml`: `image: apache/dolphinscheduler` 版本更新为 x.y.z
+ - `docker/kubernetes/dolphinscheduler`:
+ - `Chart.yaml`: `appVersion` 版本更新为 x.y.z (`version` 为 helm chart 版本,
增量更新但不要设置为 x.y.z)
+ - `values.yaml`: `image.tag` 版本更新为 x.y.z
diff --git a/docs/en-us/1.3.4/user_doc/docker-deployment.md
b/docs/en-us/1.3.4/user_doc/docker-deployment.md
index 679e05a..7c093f1 100644
--- a/docs/en-us/1.3.4/user_doc/docker-deployment.md
+++ b/docs/en-us/1.3.4/user_doc/docker-deployment.md
@@ -19,14 +19,16 @@ Please download the latest version of the source code
package, download address:
After downloading apache-dolphinscheduler-incubating-1.3.4-src.zip, uncompress
it
-```shell
+```
$ unzip apache-dolphinscheduler-incubating-1.3.4-src.zip
```
-#### 2. Install and Start the Service
+#### 2. Pull Image and Start the Service
-```shell
+```
$ cd apache-dolphinscheduler-incubating-1.3.4-src-release/docker/docker-swarm
+$ docker pull apache/dolphinscheduler:1.3.4
+$ docker tag apache/dolphinscheduler:1.3.4 apache/dolphinscheduler:latest
$ docker-compose up -d
```
diff --git a/docs/en-us/1.3.5/user_doc/docker-deployment.md
b/docs/en-us/1.3.5/user_doc/docker-deployment.md
index e2f3895..095697d 100644
--- a/docs/en-us/1.3.5/user_doc/docker-deployment.md
+++ b/docs/en-us/1.3.5/user_doc/docker-deployment.md
@@ -19,14 +19,16 @@ Please download the latest version of the source code
package, download address:
After downloading apache-dolphinscheduler-incubating-1.3.5-src.zip, uncompress
it
-```shell
+```
$ unzip apache-dolphinscheduler-incubating-1.3.5-src.zip
```
-#### 2. Install and Start the Service
+#### 2. Pull Image and Start the Service
-```shell
+```
$ cd apache-dolphinscheduler-incubating-1.3.5-src-release/docker/docker-swarm
+$ docker pull apache/dolphinscheduler:1.3.5
+$ docker tag apache/dolphinscheduler:1.3.5 apache/dolphinscheduler:latest
$ docker-compose up -d
```
@@ -183,7 +185,7 @@ You can build a docker image in A Unix-like operating
system, and you can also b
In Unix-Like, Example:
-```bash
+```sh
$ sh ./docker/build/hooks/build
```
diff --git a/docs/en-us/1.3.5/user_doc/kubernetes-deployment.md
b/docs/en-us/1.3.5/user_doc/kubernetes-deployment.md
index 9883599..37bb62d 100644
--- a/docs/en-us/1.3.5/user_doc/kubernetes-deployment.md
+++ b/docs/en-us/1.3.5/user_doc/kubernetes-deployment.md
@@ -14,12 +14,12 @@ After downloading
apache-dolphinscheduler-incubating-1.3.5-src.zip, uncompress i
To install the chart with the release name `dolphinscheduler`, please execute
the following commands:
-```bash
+```
$ unzip apache-dolphinscheduler-incubating-1.3.5-src.zip
$ cd
apache-dolphinscheduler-incubating-1.3.5-src-release/docker/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
-$ helm install dolphinscheduler .
+$ helm install dolphinscheduler . --set image.tag=1.3.5
```
To install the chart with a namespace named `test`:
diff --git a/docs/en-us/1.3.6/user_doc/docker-deployment.md
b/docs/en-us/1.3.6/user_doc/docker-deployment.md
index 25fdadf..68e8789 100644
--- a/docs/en-us/1.3.6/user_doc/docker-deployment.md
+++ b/docs/en-us/1.3.6/user_doc/docker-deployment.md
@@ -19,14 +19,16 @@ Please download the latest version of the source code
package, download address:
After downloading apache-dolphinscheduler-1.3.6-src.tar.gz, uncompress it
-```shell
+```
$ tar -zxvf apache-dolphinscheduler-1.3.6-src.tar.gz
```
-#### 2. Install and Start the Service
+#### 2. Pull Image and Start the Service
-```shell
+```
$ cd apache-dolphinscheduler-1.3.6-src/docker/docker-swarm
+$ docker pull apache/dolphinscheduler:1.3.6
+$ docker tag apache/dolphinscheduler:1.3.6 apache/dolphinscheduler:latest
$ docker-compose up -d
```
@@ -221,7 +223,7 @@ You can build a docker image in A Unix-like operating
system, and you can also b
In Unix-Like, Example:
-```bash
+```sh
$ sh ./docker/build/hooks/build
```
diff --git a/docs/en-us/1.3.6/user_doc/kubernetes-deployment.md
b/docs/en-us/1.3.6/user_doc/kubernetes-deployment.md
index 307699e..76ce84e 100644
--- a/docs/en-us/1.3.6/user_doc/kubernetes-deployment.md
+++ b/docs/en-us/1.3.6/user_doc/kubernetes-deployment.md
@@ -14,12 +14,12 @@ After downloading apache-dolphinscheduler-1.3.6-src.tar.gz,
uncompress it
To install the chart with the release name `dolphinscheduler`, please execute
the following commands:
-```bash
+```
$ tar -zxvf apache-dolphinscheduler-1.3.6-src.tar.gz
$ cd apache-dolphinscheduler-1.3.6-src/docker/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
-$ helm install dolphinscheduler .
+$ helm install dolphinscheduler . --set image.tag=1.3.6
```
To install the chart with a namespace named `test`:
diff --git a/docs/en-us/1.3.6/user_doc/skywalking-agent-deployment.md
b/docs/en-us/1.3.6/user_doc/skywalking-agent-deployment.md
index 7eb5a15..283dc8e 100644
--- a/docs/en-us/1.3.6/user_doc/skywalking-agent-deployment.md
+++ b/docs/en-us/1.3.6/user_doc/skywalking-agent-deployment.md
@@ -65,7 +65,7 @@ skywalkingLogReporterPort="11800"
#### Import dolphinscheduler dashboard to skywalking sever
-Copy the
`${dolphinscheduler.home}/skywalking-agent/dashboard/dolphinscheduler.yml` file
into `${skywalking-oap-server.home}/config/ui-initialized-templates/`
directory, and restart Skywalking oap-server.
+Copy the
`${dolphinscheduler.home}/ext/skywalking-agent/dashboard/dolphinscheduler.yml`
file into `${skywalking-oap-server.home}/config/ui-initialized-templates/`
directory, and restart Skywalking oap-server.
#### View dolphinscheduler dashboard
diff --git a/docs/zh-cn/1.3.4/user_doc/docker-deployment.md
b/docs/zh-cn/1.3.4/user_doc/docker-deployment.md
index b49f146..2599e11 100644
--- a/docs/zh-cn/1.3.4/user_doc/docker-deployment.md
+++ b/docs/zh-cn/1.3.4/user_doc/docker-deployment.md
@@ -19,14 +19,16 @@
下载 apache-dolphinscheduler-incubating-1.3.4-src.zip 后，解压缩
-```shell
+```
$ unzip apache-dolphinscheduler-incubating-1.3.4-src.zip
```
-#### 2、安装并启动服务
+#### 2、拉取镜像并启动服务
-```shell
+```
$ cd apache-dolphinscheduler-incubating-1.3.4-src-release/docker/docker-swarm
+$ docker pull apache/dolphinscheduler:1.3.4
+$ docker tag apache/dolphinscheduler:1.3.4 apache/dolphinscheduler:latest
$ docker-compose up -d
```
diff --git a/docs/zh-cn/1.3.5/user_doc/docker-deployment.md
b/docs/zh-cn/1.3.5/user_doc/docker-deployment.md
index d36d2be..632d3b1 100644
--- a/docs/zh-cn/1.3.5/user_doc/docker-deployment.md
+++ b/docs/zh-cn/1.3.5/user_doc/docker-deployment.md
@@ -19,14 +19,16 @@
下载 apache-dolphinscheduler-incubating-1.3.5-src.zip 后，解压缩
-```shell
+```
$ unzip apache-dolphinscheduler-incubating-1.3.5-src.zip
```
-#### 2、安装并启动服务
+#### 2、拉取镜像并启动服务
-```shell
+```
$ cd apache-dolphinscheduler-incubating-1.3.5-src-release/docker/docker-swarm
+$ docker pull apache/dolphinscheduler:1.3.5
+$ docker tag apache/dolphinscheduler:1.3.5 apache/dolphinscheduler:latest
$ docker-compose up -d
```
@@ -183,7 +185,7 @@ docker stack rm dolphinscheduler
类Unix系统, 如下:
-```bash
+```sh
$ sh ./docker/build/hooks/build
```
diff --git a/docs/zh-cn/1.3.5/user_doc/kubernetes-deployment.md
b/docs/zh-cn/1.3.5/user_doc/kubernetes-deployment.md
index af8b133..0897d6c 100644
--- a/docs/zh-cn/1.3.5/user_doc/kubernetes-deployment.md
+++ b/docs/zh-cn/1.3.5/user_doc/kubernetes-deployment.md
@@ -14,12 +14,12 @@
发布一个名为 `dolphinscheduler` 的版本(release)，请执行以下命令：
-```bash
+```
$ unzip apache-dolphinscheduler-incubating-1.3.5-src.zip
$ cd
apache-dolphinscheduler-incubating-1.3.5-src-release/docker/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
-$ helm install dolphinscheduler .
+$ helm install dolphinscheduler . --set image.tag=1.3.5
```
将名为 `dolphinscheduler` 的版本(release) 发布到 `test` 的命名空间中：
diff --git a/docs/zh-cn/1.3.6/user_doc/docker-deployment.md
b/docs/zh-cn/1.3.6/user_doc/docker-deployment.md
index 158abcc..77cade9 100644
--- a/docs/zh-cn/1.3.6/user_doc/docker-deployment.md
+++ b/docs/zh-cn/1.3.6/user_doc/docker-deployment.md
@@ -19,14 +19,16 @@
下载 apache-dolphinscheduler-1.3.6-src.tar.gz 后，解压缩
-```shell
+```
$ tar -zxvf apache-dolphinscheduler-1.3.6-src.tar.gz
```
-#### 2、安装并启动服务
+#### 2、拉取镜像并启动服务
-```shell
+```
$ cd apache-dolphinscheduler-1.3.6-src/docker/docker-swarm
+$ docker pull apache/dolphinscheduler:1.3.6
+$ docker tag apache/dolphinscheduler:1.3.6 apache/dolphinscheduler:latest
$ docker-compose up -d
```
@@ -221,7 +223,7 @@ docker stack rm dolphinscheduler
类Unix系统, 如下:
-```bash
+```sh
$ sh ./docker/build/hooks/build
```
diff --git a/docs/zh-cn/1.3.6/user_doc/kubernetes-deployment.md
b/docs/zh-cn/1.3.6/user_doc/kubernetes-deployment.md
index a22ed83..97e7516 100644
--- a/docs/zh-cn/1.3.6/user_doc/kubernetes-deployment.md
+++ b/docs/zh-cn/1.3.6/user_doc/kubernetes-deployment.md
@@ -14,12 +14,12 @@
发布一个名为 `dolphinscheduler` 的版本(release)，请执行以下命令：
-```bash
+```
$ tar -zxvf apache-dolphinscheduler-1.3.6-src.tar.gz
$ cd apache-dolphinscheduler-1.3.6-src/docker/kubernetes/dolphinscheduler
$ helm repo add bitnami https://charts.bitnami.com/bitnami
$ helm dependency update .
-$ helm install dolphinscheduler .
+$ helm install dolphinscheduler . --set image.tag=1.3.6
```
将名为 `dolphinscheduler` 的版本(release) 发布到 `test` 的命名空间中：
diff --git a/docs/zh-cn/1.3.6/user_doc/skywalking-agent-deployment.md
b/docs/zh-cn/1.3.6/user_doc/skywalking-agent-deployment.md
index 139926f..a237b38 100644
--- a/docs/zh-cn/1.3.6/user_doc/skywalking-agent-deployment.md
+++ b/docs/zh-cn/1.3.6/user_doc/skywalking-agent-deployment.md
@@ -65,7 +65,7 @@ skywalkingLogReporterPort="11800"
#### 导入图表到 Skywalking server
-复制 `${dolphinscheduler.home}/skywalking-agent/dashboard/dolphinscheduler.yml`
文件到 `${skywalking-oap-server.home}/config/ui-initialized-templates/` 目录下，并重启
Skywalking oap-server。
+复制
`${dolphinscheduler.home}/ext/skywalking-agent/dashboard/dolphinscheduler.yml`
文件到 `${skywalking-oap-server.home}/config/ui-initialized-templates/` 目录下，并重启
Skywalking oap-server。
#### 查看 dolphinscheduler 图表
diff --git a/src/components/md2html/index.jsx b/src/components/md2html/index.jsx
index f546488..2fdc2be 100644
--- a/src/components/md2html/index.jsx
+++ b/src/components/md2html/index.jsx
@@ -86,6 +86,10 @@ const Md2Html = ComposeComponent => class extends
ComposeComponent {
alink.href = href.replace(`docs/${siteConfig.docsLatest}`,
'docs/latest');
}
});
+ // convert version to latest
+ let innerHTML =
this.markdownContainer.innerHTML.replaceAll(`apache/dolphinscheduler:${siteConfig.docsLatest}`,
'apache/dolphinscheduler:latest');
+ innerHTML = innerHTML.replaceAll('$ docker tag
apache/dolphinscheduler:latest apache/dolphinscheduler:latest\n',
'').replaceAll(` --set image.tag=${siteConfig.docsLatest}`, '');
+ this.markdownContainer.innerHTML = innerHTML;
}
};
