You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2021/05/24 12:24:19 UTC
[dolphinscheduler-website] branch master updated: update docs to
build docker in 1.3.5 (#370)
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 dfe1875 update docs to build docker in 1.3.5 (#370)
dfe1875 is described below
commit dfe1875584f102688477fd703f01f52ca63669a7
Author: Shiwen Cheng <ch...@gmail.com>
AuthorDate: Mon May 24 20:24:09 2021 +0800
update docs to build docker in 1.3.5 (#370)
---
docs/en-us/1.3.5/user_doc/docker-deployment.md | 23 +++++++++++++++++------
docs/en-us/1.3.6/user_doc/docker-deployment.md | 4 ++--
docs/zh-cn/1.3.5/user_doc/docker-deployment.md | 23 +++++++++++++++++------
docs/zh-cn/1.3.6/user_doc/docker-deployment.md | 4 ++--
4 files changed, 38 insertions(+), 16 deletions(-)
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 ad58498..43c610c 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
@@ -248,22 +248,33 @@ docker service scale dolphinscheduler_dolphinscheduler-worker=3
### How to build a Docker image?
-You can build a docker image in A Unix-like operating system, and you can also build it in Windows operating system.
+#### 1. Build from the source code (Require Maven 3.3+ & JDK 1.8+)
-In Unix-Like, Example:
+In Unix-Like, execute in Terminal:
-```sh
-$ sh ./docker/build/hooks/build
+```bash
+$ bash ./docker/build/hooks/build
```
-In Windows, Example:
+In Windows, execute in cmd or PowerShell:
```bat
-C:\dolphinscheduler>.\docker\build\hooks\build.bat
+C:\dolphinscheduler-src>.\docker\build\hooks\build.bat
```
Please read `./docker/build/hooks/build` `./docker/build/hooks/build.bat` script files if you don't understand
+#### 2. Build from the binary distribution (Not require Maven 3.3+ & JDK 1.8+)
+
+Please download the binary distribution package apache-dolphinscheduler-incubating-1.3.5-dolphinscheduler-bin.tar.gz, download address: [download](/en-us/download/download.html). And put apache-dolphinscheduler-incubating-1.3.5-dolphinscheduler-bin.tar.gz into the `apache-dolphinscheduler-incubating-1.3.5-src-release/docker/build` directory, execute in Terminal or PowerShell:
+
+```
+$ cd apache-dolphinscheduler-incubating-1.3.5-src-release/docker/build
+$ docker build --build-arg VERSION=1.3.5 -t apache/dolphinscheduler:1.3.5 .
+```
+
+> PowerShell should use `cd apache-dolphinscheduler-incubating-1.3.5-src-release/docker/build`
+
### How to add an environment variable for Docker?
If you would like to do additional initialization in an image derived from this one, add one or more environment variables under `/root/start-init-conf.sh`, and modify template files in `/opt/dolphinscheduler/conf/*.tpl`.
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 c5e58a8..cb651f3 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
@@ -307,8 +307,8 @@ docker service scale dolphinscheduler_dolphinscheduler-worker=3
In Unix-Like, execute in Terminal:
-```
-$ sh ./docker/build/hooks/build
+```bash
+$ bash ./docker/build/hooks/build
```
In Windows, execute in cmd or PowerShell:
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 3de55f8..3debd97 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
@@ -248,22 +248,33 @@ docker service scale dolphinscheduler_dolphinscheduler-worker=3
### 如何构建一个 Docker 镜像？
-你可以在类Unix系统和Windows系统中构建一个docker镜像。
+#### 1. 从源码构建 (需要 Maven 3.3+ & JDK 1.8+)
-类Unix系统, 如下:
+类 Unix 系统，在 Terminal 中执行:
-```sh
-$ sh ./docker/build/hooks/build
+```bash
+$ bash ./docker/build/hooks/build
```
-Windows系统, 如下:
+Windows 系统，在 cmd 或 PowerShell 中执行:
```bat
-C:\dolphinscheduler>.\docker\build\hooks\build.bat
+C:\dolphinscheduler-src>.\docker\build\hooks\build.bat
```
如果你不理解 `./docker/build/hooks/build` `./docker/build/hooks/build.bat` 这些脚本，请阅读里面的内容
+#### 2. 从二进制包构建 (不需要 Maven 3.3+ & JDK 1.8+)
+
+请下载二进制包 apache-dolphinscheduler-incubating-1.3.5-dolphinscheduler-bin.tar.gz，下载地址: [下载](/zh-cn/download/download.html). 然后将 apache-dolphinscheduler-incubating-1.3.5-dolphinscheduler-bin.tar.gz 放到 `apache-dolphinscheduler-incubating-1.3.5-src-release/docker/build` 目录里，在 Terminal 或 PowerShell 中执行:
+
+```
+$ cd apache-dolphinscheduler-incubating-1.3.5-src-release/docker/build
+$ docker build --build-arg VERSION=1.3.5 -t apache/dolphinscheduler:1.3.5 .
+```
+
+> PowerShell 应该使用 `cd apache-dolphinscheduler-incubating-1.3.5-src-release/docker/build`
+
### 如何为 Docker 添加一个环境变量？
如果你想在编译的时候或者运行的时候附加一些其它的操作及新增一些环境变量，你可以在`/root/start-init-conf.sh`文件中进行修改，同时如果涉及到配置文件的修改，请在`/opt/dolphinscheduler/conf/*.tpl`中修改相应的配置文件
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 c2c949c..2de6be9 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
@@ -307,8 +307,8 @@ docker service scale dolphinscheduler_dolphinscheduler-worker=3
类 Unix 系统，在 Terminal 中执行:
-```
-$ sh ./docker/build/hooks/build
+```bash
+$ bash ./docker/build/hooks/build
```
Windows 系统，在 cmd 或 PowerShell 中执行: