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 aa4cfad Update docker deployment on Windows with Docker Toolbox (#345)
aa4cfad is described below
commit aa4cfade3fbc319921087cc0fd8cf4992cb0d5cb
Author: Shiwen Cheng <[email protected]>
AuthorDate: Thu Apr 29 22:50:18 2021 +0800
Update docker deployment on Windows with Docker Toolbox (#345)
---
docs/en-us/1.3.4/user_doc/docker-deployment.md | 2 +-
docs/en-us/1.3.5/user_doc/docker-deployment.md | 2 +-
docs/en-us/1.3.6/user_doc/docker-deployment.md | 26 +++++++++++++++++++++++++-
docs/zh-cn/1.3.4/user_doc/docker-deployment.md | 2 +-
docs/zh-cn/1.3.5/user_doc/docker-deployment.md | 2 +-
docs/zh-cn/1.3.6/user_doc/docker-deployment.md | 26 +++++++++++++++++++++++++-
6 files changed, 54 insertions(+), 6 deletions(-)
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 7c093f1..957a49b 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
@@ -77,7 +77,7 @@ $ docker run -d --name dolphinscheduler \
apache/dolphinscheduler:1.3.4 all
```
-Note: database username and password need to be replaced with your database
username and password, 192.168.x.x need to be replaced with your relate
zookeeper or database host IP
+Note: database username test and password test need to be replaced with your
actual PostgreSQL username and password, 192.168.x.x need to be replaced with
your relate PostgreSQL and ZooKeeper host IP
#### 6. Login
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 72124de..8058de7 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
@@ -77,7 +77,7 @@ $ docker run -d --name dolphinscheduler \
apache/dolphinscheduler:1.3.5 all
```
-Note: database username and password need to be replaced with your database
username and password, 192.168.x.x need to be replaced with your relate
zookeeper or database host IP
+Note: database username test and password test need to be replaced with your
actual PostgreSQL username and password, 192.168.x.x need to be replaced with
your relate PostgreSQL and ZooKeeper host IP
#### 6. Login
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 423f07a..176a88b 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
@@ -13,6 +13,22 @@ Here're 3 ways to quickly install DolphinScheduler
In this way, you need to install
[docker-compose](https://docs.docker.com/compose/) as a prerequisite, please
install it yourself according to the rich docker-compose installation guidance
on the Internet
+For Windows 10, you can install [Docker
Desktop](https://docs.docker.com/docker-for-windows/install/). For Windows 7, 8
and 8.1, you can install [Docker Toolbox](https://github.com/docker/toolbox)
+
+#### 0. Requirements
+
+For Mac user, please configure memory not less than 4GB (Click `Docker Desktop
-> Preferences -> Resources -> Memory`)
+
+For Windows Docker Toolbox user, three items need to be configured:
+
+ - Ensure that **hardware virtualization** is enabled which may need to set
the BIOS
+ - Configure memory not less than 4G
+ - Open **Oracle VirtualBox Manager**, if you double-click **Docker
Quickstart Terminal** and successfully run Docker Toolbox, you will see a
Virtual Machine named `default`
+ - Click `Settings -> System -> Motherboard -> Base Memory`
+ - Configure port forwarding
+ - Click `Settings -> Network -> Advanced -> Port Forwarding -> Add`
+ - `Name`, `Host Port` and `Guest Port` all fill in `12345`, regardless of
`Host IP` and `Guest IP`
+
#### 1. Download the Source Code Package
Please download the latest version of the source code package, download
address: [download](/en-us/download/download.html)
@@ -32,6 +48,14 @@ $ docker tag apache/dolphinscheduler:1.3.6
apache/dolphinscheduler:latest
$ docker-compose up -d
```
+##### 2.1 For Docker Toolbox on Windows
+
+Just double-click **Docker Quickstart Terminal** and type the above commands
+
+##### 2.2 For Docker Desktop on Windows
+
+Coming soon
+
#### 3. Login
Visit the Web UI: http://192.168.xx.xx:12345/dolphinscheduler
@@ -77,7 +101,7 @@ $ docker run -d --name dolphinscheduler \
apache/dolphinscheduler:1.3.6 all
```
-Note: database username and password need to be replaced with your database
username and password, 192.168.x.x need to be replaced with your relate
zookeeper or database host IP
+Note: database username test and password test need to be replaced with your
actual PostgreSQL username and password, 192.168.x.x need to be replaced with
your relate PostgreSQL and ZooKeeper host IP
#### 6. Login
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 2599e11..cd5251d 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
@@ -77,7 +77,7 @@ $ docker run -d --name dolphinscheduler \
apache/dolphinscheduler:1.3.4 all
```
-注：数据库用户和密码需要替换为具体的数据库用户名和密码，192.168.x.x 需要替换为 zookeeper 和 数据库的主机 IP
+注：数据库用户 test 和密码 test 需要替换为实际的 PostgreSQL 用户和密码，192.168.x.x 需要替换为 PostgreSQL 和
ZooKeeper 的主机 IP
#### 6、登录系统
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 25256bd..7de3282 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
@@ -77,7 +77,7 @@ $ docker run -d --name dolphinscheduler \
apache/dolphinscheduler:1.3.5 all
```
-注：数据库用户和密码需要替换为具体的数据库用户名和密码，192.168.x.x 需要替换为 zookeeper 和 数据库的主机 IP
+注：数据库用户 test 和密码 test 需要替换为实际的 PostgreSQL 用户和密码，192.168.x.x 需要替换为 PostgreSQL 和
ZooKeeper 的主机 IP
#### 6、登录系统
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 d523494..74443e9 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
@@ -13,6 +13,22 @@
这种方式需要先安装 [docker-compose](https://docs.docker.com/compose/) , docker-compose
的安装网上已经有非常多的资料，请自行安装即可
+对于 Windows 10，你可以安装 [Docker
Desktop](https://docs.docker.com/docker-for-windows/install/)。对于 Windows 7, 8 和
8.1, 你可以安装 [Docker Toolbox](https://github.com/docker/toolbox)
+
+#### 0、要求
+
+对于 Mac 用户，请配置内存不少于 4GB (点击 `Docker Desktop -> Preferences -> Resources ->
Memory`)
+
+对于 Windows Docker Toolbox 用户，有三项需要配置：
+
+ - 确保**硬件虚拟化**开启，它可能需要设置 BIOS
+ - 配置内存不少于 4GB
+ - 打开 **Oracle VirtualBox Manager**，如果你双击 **Docker Quickstart Terminal**
并成功运行 Docker Toolbox，你将会看到一个名为 `default` 的虚拟机
+ - 点击 `设置 -> 系统 -> 主板 -> 内存大小`
+ - 配置端口转发
+ - 点击 `设置 -> 网络 -> 高级 -> 端口转发 -> 添加`
+ - `名称`，`主机端口` 和 `子系统端口` 都填写 `12345`，不填 `主机IP` 和 `子系统IP`
+
#### 1、下载源码包
请下载最新版本的源码包，下载地址: [下载](/zh-cn/download/download.html)
@@ -32,6 +48,14 @@ $ docker tag apache/dolphinscheduler:1.3.6
apache/dolphinscheduler:latest
$ docker-compose up -d
```
+##### 2.1 For Docker Toolbox on Windows
+
+双击 **Docker Quickstart Terminal** 并键入以上命令即可
+
+##### 2.2 For Docker Desktop on Windows
+
+即将到来
+
#### 3、登录系统
访问前端页面： http://192.168.xx.xx:12345/dolphinscheduler
@@ -77,7 +101,7 @@ $ docker run -d --name dolphinscheduler \
apache/dolphinscheduler:1.3.6 all
```
-注：数据库用户和密码需要替换为具体的数据库用户名和密码，192.168.x.x 需要替换为 zookeeper 和 数据库的主机 IP
+注：数据库用户 test 和密码 test 需要替换为实际的 PostgreSQL 用户和密码，192.168.x.x 需要替换为 PostgreSQL 和
ZooKeeper 的主机 IP
#### 6、登录系统
