This is an automated email from the ASF dual-hosted git repository.

monster pushed a commit to branch dev
in repository 
https://gitbox.apache.org/repos/asf/incubator-streampark-website.git


The following commit(s) were added to refs/heads/dev by this push:
     new 96d2b55b Update dockerDeployment.md
96d2b55b is described below

commit 96d2b55b45058b75b7cfda183dd476223d7c414c
Author: Monster <[email protected]>
AuthorDate: Mon Oct 17 15:42:14 2022 +0800

    Update dockerDeployment.md
---
 docs/user-guide/4-dockerDeployment.md              |  84 ++++++++++++++-----
 .../current/user-guide/4-dockerDeployment.md       |  93 ++++++++++++++++-----
 .../current/user-guide/img.png                     | Bin 0 -> 57117 bytes
 static/doc/image/streampark_docker-compose.png     | Bin 0 -> 30747 bytes
 .../image/streampark_source_generation_image.png   | Bin 0 -> 57117 bytes
 static/doc/image/streamx_docker-compose.png        | Bin 49077 -> 0 bytes
 6 files changed, 138 insertions(+), 39 deletions(-)

diff --git a/docs/user-guide/4-dockerDeployment.md 
b/docs/user-guide/4-dockerDeployment.md
index c66be246..617217d6 100644
--- a/docs/user-guide/4-dockerDeployment.md
+++ b/docs/user-guide/4-dockerDeployment.md
@@ -18,37 +18,83 @@ To start the service with docker-compose, you need to 
install [docker-compose](h
 ## Rapid StreamPark Deployment
 
 ### StreamPark deployment based on h2 and docker-compose
-```
+
+#### Deployment
+
+```html
 wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/docker-compose.yaml
+wget https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/.env
 docker-compose up -d
 ```
 
-Once the service is started, StreamPark can be accessed through 
http://localhost:10000 and also through http://localhost:8081 to access Flink. 
Accessing the StreamPark link will redirect you to the login page, where the 
default user and password for StreamPark are admin and streamx respectively. To 
learn more about the operation, please refer to the user manual for a quick 
start.
+Once the service is started, StreamPark can be accessed through 
http://localhost:10000 and also through http://localhost:8081 to access Flink. 
Accessing the StreamPark link will redirect you to the login page, where the 
default user and password for StreamPark are admin and streampark respectively. 
To learn more about the operation, please refer to the user manual for a quick 
start.
+
+#### Configure flink home
+
+![](/doc/image/streampark_flinkhome.png)
+
+#### Configure flink-session cluster
+
+![](/doc/image/remote.png)
+
+Note:When configuring the flink-sessin cluster address, the ip address is not 
localhost, but the host network ip, which can be obtained through ifconfig
+
+#### Submit a task
+
+![](/doc/image/remoteSubmission.png)
 
 ### Use existing Mysql services
 This approach is suitable for enterprise production, where you can quickly 
deploy strempark based on docker and associate it with an online database
+Note: The diversity of deployment support is maintained through the .env 
configuration file, make sure there is one and only one .env file in the 
directory
 
+```html
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/docker-compose.yaml
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/mysql/.env
+vim .env
 ```
-docker run -d --name streampark \
-    -e DATABASE="mysql" \
-    -e SPRING_DATASOURCE_URL="jdbc:mysql://localhost:3306/<DATABASE>" \
-    -e SPRING_DATASOURCE_USERNAME="<USER>" \
-    -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
-    -p 10000:10000 \
-    -v /var/run/docker.sock:/var/run/docker.sock \
-    -v /etc/hosts:/etc/hosts \
-    -v ~/.kube:/root/.kube \
-    --net host \
-    -d apache/incubator-streampark:"${STREAMPARK_VERSION}" /bin/sh -c "wget 
https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.30.tar.gz
 && tar -zxvf mysql-connector-java-8.0.30.tar.gz && cp 
mysql-connector-java-8.0.30/mysql-connector-java-8.0.30.jar lib && bash 
bin/startup.sh"
+Modify the corresponding connection information
+```html
+SPRING_PROFILES_ACTIVE=mysql
+SPRING_DATASOURCE_URL=jdbc:mysql://localhost:3306/streampark?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
+SPRING_DATASOURCE_USERNAME=root
+SPRING_DATASOURCE_PASSWORD=streampark
 ```
 
-## Login System
+```
+docker-compose up -d
+```
+### Use existing Pgsql services
+```html
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/docker-compose.yaml
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/pgsql/.env
+vim .env
+```
+Modify the corresponding connection information
+```html
+SPRING_PROFILES_ACTIVE=pgsql
+SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/streampark?stringtype=unspecified
+SPRING_DATASOURCE_USERNAME=postgres
+SPRING_DATASOURCE_PASSWORD=streampark
+```
+```
+docker-compose up -d
+```
+
+## Build images based on source code for StreamPark deployment
+```
+git clone https://github.com/apache/incubator-streampark.git
+cd incubator-streampark/deploy/docker
+vim docker-compose
+```
 
-Once the service is started, StreamPark can be accessed through 
http://localhost:10000 and also through http://localhost:8081访问Flink
-After accessing the StreamPark link you will be redirected to the login page, 
the default user and password for StreamPark are admin and streampark 
respectively. To learn more about the operation please refer to the user manual 
for a quick start
+```html
+    build:
+      context: ../..
+      dockerfile: deploy/docker/console/Dockerfile
+#    image: ${HUB}:${TAG}
+```
+![img.png](img.png)
 
-## Setting up Flink Home on StreamPark Web Ui
 ```
-streampark/flink/flink1.14.5/
+docker-compose up -d
 ```
-![](/doc/image/streamx_flinkhome.png)
diff --git 
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/4-dockerDeployment.md
 
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/4-dockerDeployment.md
index 97495bf8..0ec85a5f 100644
--- 
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/4-dockerDeployment.md
+++ 
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/4-dockerDeployment.md
@@ -20,37 +20,90 @@ sidebar_position: 4
 
 ### 基于h2和docker-compose进行StreamPark部署
 该方式适用于入门学习、熟悉功能特性
-```
+#### 部署
+
+```html
 wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/docker-compose.yaml
+wget https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/.env
 docker-compose up -d
 ```
-服务启动后,可以通过 http://localhost:10000 访问 StreamPark,同时也可以通过 
http://localhost:8081访问Flink。访问StreamPark链接后会跳转到登陆页面,StreamPark 默认的用户和密码分别为 
admin 和 streamx。想要了解更多操作请参考用户手册快速上手。
-![](/doc/image/streamx_docker-compose.png)
+服务启动后,可以通过 http://localhost:10000 访问 StreamPark,同时也可以通过 
http://localhost:8081访问Flink。访问StreamPark链接后会跳转到登陆页面,StreamPark 默认的用户和密码分别为 
admin 和 streampark。想要了解更多操作请参考用户手册快速上手。
+![](/doc/image/streampark_docker-compose.png)
 
该部署方式会自动给你启动一个flink-session集群供你去进行flink任务使用,同时也会挂载本地docker服务以及~/.kube来用于k8s模式的任务提交
 
+#### 配置flink home
+
+![](/doc/image/streampark_flinkhome.png)
+
+#### 配置session集群
+
+![](/doc/image/remote.png)
+
+注意:在配置flink-sessin集群地址时,填写的ip地址不是localhost,而是宿主机网络ip,该ip地址可以通过ifconfig来进行获取
+
+#### 提交任务
+
+![](/doc/image/remoteSubmission.png)
+
+
 ### 沿用已有的 Mysql 服务
 该方式适用于企业生产,你可以基于docker快速部署strempark并将其和线上数据库进行关联
+注意:部署支持的多样性是通过.env这个配置文件来进行维护的,要保证目录下有且仅有一个.env文件
+```
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/docker-compose.yaml
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/mysql/.env
+vim .env
 ```
-docker run -d --name streampark \
-    -e DATABASE="mysql" \
-    -e SPRING_DATASOURCE_URL="jdbc:mysql://localhost:3306/<DATABASE>" \
-    -e SPRING_DATASOURCE_USERNAME="<USER>" \
-    -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
-    -p 10000:10000 \
-    -v /var/run/docker.sock:/var/run/docker.sock \
-    -v /etc/hosts:/etc/hosts \
-    -v ~/.kube:/root/.kube \
-    --net host \
-    -d apache/incubator-streampark:"${STREAMPARK_VERSION}" /bin/sh -c "wget 
https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.30.tar.gz
 && tar -zxvf mysql-connector-java-8.0.30.tar.gz && cp 
mysql-connector-java-8.0.30/mysql-connector-java-8.0.30.jar lib && bash 
bin/startup.sh"
+修改对应的连接信息
+```html
+SPRING_PROFILES_ACTIVE=mysql
+SPRING_DATASOURCE_URL=jdbc:mysql://localhost:3306/streampark?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
+SPRING_DATASOURCE_USERNAME=root
+SPRING_DATASOURCE_PASSWORD=streampark
 ```
 
-## 登陆系统
+```html
+docker-compose up -d
+```
+### 沿用已有的 Pgsql 服务
+```html
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/docker-compose.yaml
+wget 
https://github.com/apache/incubator-streampark/blob/dev/deploy/docker/pgsql/.env
+vim .env
+```
+修改对应的连接信息
+```html
+SPRING_PROFILES_ACTIVE=pgsql
+SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/streampark?stringtype=unspecified
+SPRING_DATASOURCE_USERNAME=postgres
+SPRING_DATASOURCE_PASSWORD=streampark
+```
+```html
+docker-compose up -d
+```
 
-服务启动后,可以通过 http://localhost:10000 访问 StreamPark,同时也可以通过 
http://localhost:8081访问Flink
-访问StreamPark链接后会跳转到登陆页面,StreamPark 默认的用户和密码分别为 admin 和 
streampark。想要了解更多操作请参考用户手册快速上手
+## 基于源码构建镜像进行StreamPark部署
+```html
+git clone https://github.com/apache/incubator-streampark.git
+cd incubator-streampark/deploy/docker
+vim docker-compose.yaml
+```
 
-## 在 StreamPark Web Ui 上设置 Flink Home
+```html
+    build:
+      context: ../..
+      dockerfile: deploy/docker/console/Dockerfile
+#   image: ${HUB}:${TAG}
 ```
-streampark/flink/flink1.14.5/
+![](/doc/image/streampark_source_generation_image.png)
+
+```html
+cd ../..
+./build.sh
 ```
-![](/doc/image/streamx_flinkhome.png)
+![](/doc/image/streamx_build.png)
+
+```html
+cd deploy/docker
+docker-compose up -d
+```
\ No newline at end of file
diff --git 
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/img.png 
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/img.png
new file mode 100644
index 00000000..369de2e8
Binary files /dev/null and 
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/user-guide/img.png differ
diff --git a/static/doc/image/streampark_docker-compose.png 
b/static/doc/image/streampark_docker-compose.png
new file mode 100644
index 00000000..54332c58
Binary files /dev/null and b/static/doc/image/streampark_docker-compose.png 
differ
diff --git a/static/doc/image/streampark_source_generation_image.png 
b/static/doc/image/streampark_source_generation_image.png
new file mode 100644
index 00000000..369de2e8
Binary files /dev/null and 
b/static/doc/image/streampark_source_generation_image.png differ
diff --git a/static/doc/image/streamx_docker-compose.png 
b/static/doc/image/streamx_docker-compose.png
deleted file mode 100644
index 7e4cda24..00000000
Binary files a/static/doc/image/streamx_docker-compose.png and /dev/null differ

Reply via email to