From e626b990904cb81436d522db23deb9ad6e00d1c4 Mon Sep 17 00:00:00 2001
From: haoqi <1148648445@qq.com>
Date: Tue, 20 Sep 2022 19:30:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=88=A0=E9=99=A4km-dist/docker=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=EF=BC=8C=E4=BB=A5[=E5=8D=95=E6=9C=BA?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=89=8B=E5=86=8C.md]=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/install_guide/单机部署手册.md | 43 ++++++++------
 km-dist/docker/docker-compose.yml  | 91 ------------------------------
 2 files changed, 26 insertions(+), 108 deletions(-)
 delete mode 100644 km-dist/docker/docker-compose.yml

diff --git a/docs/install_guide/单机部署手册.md b/docs/install_guide/单机部署手册.md
index 5110fa72..b429b9d5 100644
--- a/docs/install_guide/单机部署手册.md
+++ b/docs/install_guide/单机部署手册.md
@@ -94,9 +94,9 @@ helm pull knowstreaming/knowstreaming-manager
 version: "3"
 
 services:
-
+  
   knowstreaming-manager:
-    image: haiti/knowstreaming-manager:0.1.0
+    image: knowstreaming/knowstreaming-manager:0.2.0-test
     container_name: knowstreaming-manager
     privileged: true
     restart: always
@@ -105,6 +105,9 @@ services:
       - knowstreaming-mysql
     expose:
       - 80
+    command:
+      - /bin/sh
+      - /ks-start.sh
     environment:
       TZ: Asia/Shanghai
 
@@ -117,12 +120,12 @@ services:
 
       JAVA_OPTS: -Xmx1g -Xms1g
 
-  #    extra_hosts:
-  #      - "hostname:x.x.x.x"
-  #    volumes:
-  #      - /Users/haoqi/Downloads/ks/manage/log:/logs
+#    extra_hosts:
+#      - "hostname:x.x.x.x"
+#    volumes:
+#      - /ks/manage/log:/logs
   knowstreaming-ui:
-    image: haiti/knowstreaming-ui:0.1.0
+    image: knowstreaming/knowstreaming-ui:0.2.0-test1
     container_name: knowstreaming-ui
     restart: always
     ports:
@@ -131,8 +134,8 @@ services:
       TZ: Asia/Shanghai
     depends_on:
       - knowstreaming-manager
-  #    extra_hosts:
-  #      - "hostname:x.x.x.x"
+#    extra_hosts:
+#      - "hostname:x.x.x.x"
 
   elasticsearch-single:
     image: docker.io/library/elasticsearch:7.6.2
@@ -141,38 +144,44 @@ services:
     expose:
       - 9200
       - 9300
-    #    ports:
-    #      - '9200:9200'
-    #      - '9300:9300'
+#    ports:
+#      - '9200:9200'
+#      - '9300:9300'
     environment:
       TZ: Asia/Shanghai
       ES_JAVA_OPTS: -Xms512m -Xmx512m
       discovery.type: single-node
-  #    volumes:
-  #      - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data
+#    volumes:
+#      - /ks/es/data:/usr/share/elasticsearch/data
 
   knowstreaming-init:
-    image: haiti/knowstreaming-init:0.1.0
+    image: knowstreaming/knowstreaming-manager:0.2.0-test
     container_name: knowstreaming_init
     depends_on:
       - elasticsearch-single
+    command:
+      - /bin/bash
+      - /es_template_create.sh
     environment:
       TZ: Asia/Shanghai
       SERVER_ES_ADDRESS: elasticsearch-single:9200
 
 
   knowstreaming-mysql:
-    image: haiti/knowstreaming-mysql:0.1.0
+    image: knowstreaming/knowstreaming-mysql:0.2.0-test
     container_name: knowstreaming-mysql
     restart: always
     environment:
       TZ: Asia/Shanghai
       MYSQL_ROOT_PASSWORD: admin2022_
       MYSQL_DATABASE: know_streaming
+      MYSQL_ROOT_HOST: '%'
     expose:
       - 3306
+#    ports:
+#      - '3306:3306'
 #    volumes:
-#      - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql
+#      - /ks/mysql/data:/data/mysql
 ```
 
 &nbsp;
diff --git a/km-dist/docker/docker-compose.yml b/km-dist/docker/docker-compose.yml
deleted file mode 100644
index a9fe2bf3..00000000
--- a/km-dist/docker/docker-compose.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-version: "3"
-
-services:
-  
-  knowstreaming-manager:
-    image: knowstreaming/knowstreaming-manager:0.2.0-test
-    container_name: knowstreaming-manager
-    privileged: true
-    restart: always
-    depends_on:
-      - elasticsearch-single
-      - knowstreaming-mysql
-    expose:
-      - 80
-    command:
-      - /bin/sh
-      - /ks-start.sh
-    environment:
-      TZ: Asia/Shanghai
-
-      SERVER_MYSQL_ADDRESS: knowstreaming-mysql:3306
-      SERVER_MYSQL_DB: know_streaming
-      SERVER_MYSQL_USER: root
-      SERVER_MYSQL_PASSWORD: admin2022_
-
-      SERVER_ES_ADDRESS: elasticsearch-single:9200
-
-      JAVA_OPTS: -Xmx1g -Xms1g
-
-#    extra_hosts:
-#      - "hostname:x.x.x.x"
-#    volumes:
-#      - /ks/manage/log:/logs
-  knowstreaming-ui:
-    image: knowstreaming/knowstreaming-ui:0.2.0-test1
-    container_name: knowstreaming-ui
-    restart: always
-    ports:
-      - '18092:80'
-    environment:
-      TZ: Asia/Shanghai
-    depends_on:
-      - knowstreaming-manager
-#    extra_hosts:
-#      - "hostname:x.x.x.x"
-
-  elasticsearch-single:
-    image: docker.io/library/elasticsearch:7.6.2
-    container_name: elasticsearch-single
-    restart: always
-    expose:
-      - 9200
-      - 9300
-#    ports:
-#      - '9200:9200'
-#      - '9300:9300'
-    environment:
-      TZ: Asia/Shanghai
-      ES_JAVA_OPTS: -Xms512m -Xmx512m
-      discovery.type: single-node
-#    volumes:
-#      - /ks/es/data:/usr/share/elasticsearch/data
-
-  knowstreaming-init:
-    image: knowstreaming/knowstreaming-manager:0.2.0-test
-    container_name: knowstreaming_init
-    depends_on:
-      - elasticsearch-single
-    command:
-      - /bin/bash
-      - /es_template_create.sh
-    environment:
-      TZ: Asia/Shanghai
-      SERVER_ES_ADDRESS: elasticsearch-single:9200
-
-
-  knowstreaming-mysql:
-    image: knowstreaming/knowstreaming-mysql:0.2.0-test
-    container_name: knowstreaming-mysql
-    restart: always
-    environment:
-      TZ: Asia/Shanghai
-      MYSQL_ROOT_PASSWORD: admin2022_
-      MYSQL_DATABASE: know_streaming
-      MYSQL_ROOT_HOST: '%'
-    expose:
-      - 3306
-#    ports:
-#      - '3306:3306'
-#    volumes:
-#      - /ks/mysql/data:/data/mysql
\ No newline at end of file