1. 调整docker-compose.yml中networks配置

2. ks-manager添加健康检查
3. 更新单机部署手册

Author: haoqi

docs/install_guide/单机部署手册.md

@@ -59,6 +59,8 @@ sh deploy_KnowStreaming-offline.sh
 
 ### 2.1.3、容器部署
 
+#### 2.1.3.1、Helm
+
 **环境依赖**
 
 - Kubernetes >= 1.14 ，Helm >= 2.17.0
@@ -87,6 +89,94 @@ helm pull knowstreaming/knowstreaming-manager
 
  
 
+#### 2.1.3.2、Docker Compose
+```yml
+version: "3"
+
+services:
+
+  knowstreaming-manager:
+    image: haiti/knowstreaming-manager:0.1.0
+    container_name: knowstreaming-manager
+    privileged: true
+    restart: always
+    depends_on:
+      - elasticsearch-single
+      - knowstreaming-mysql
+    expose:
+      - 80
+    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:
+  #      - /Users/haoqi/Downloads/ks/manage/log:/logs
+  knowstreaming-ui:
+    image: haiti/knowstreaming-ui:0.1.0
+    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:
+  #      - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data
+
+  knowstreaming-init:
+    image: haiti/knowstreaming-init:0.1.0
+    container_name: knowstreaming_init
+    depends_on:
+      - elasticsearch-single
+    environment:
+      TZ: Asia/Shanghai
+      SERVER_ES_ADDRESS: elasticsearch-single:9200
+
+
+  knowstreaming-mysql:
+    image: haiti/knowstreaming-mysql:0.1.0
+    container_name: knowstreaming-mysql
+    restart: always
+    environment:
+      TZ: Asia/Shanghai
+      MYSQL_ROOT_PASSWORD: admin2022_
+      MYSQL_DATABASE: know_streaming
+    expose:
+      - 3306
+#    volumes:
+#      - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql
+```
+
+ 
+
 ### 2.1.4、手动部署
 
 **部署流程**

km-dist/docker/docker-compose.yml

@@ -10,9 +10,6 @@ services:
     depends_on:
       - elasticsearch-single
       - knowstreaming-mysql
-    links:
-      - elasticsearch-single
-      - knowstreaming-mysql
     expose:
       - 80
     environment:
@@ -26,8 +23,7 @@ services:
       SERVER_ES_ADDRESS: elasticsearch-single:9200
 
       JAVA_OPTS: -Xmx1g -Xms1g
-    networks:
-      - ks
+
 #    extra_hosts:
 #      - "hostname:x.x.x.x"
 #    volumes:
@@ -42,10 +38,6 @@ services:
       TZ: Asia/Shanghai
     depends_on:
       - knowstreaming-manager
-    links:
-      - knowstreaming-manager
-    networks:
-      - ks
 #    extra_hosts:
 #      - "hostname:x.x.x.x"
 
@@ -65,20 +57,16 @@ services:
       discovery.type: single-node
 #    volumes:
 #      - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data
-    networks:
-      - ks
+
   knowstreaming-init:
     image: haiti/knowstreaming-init:0.1.0
     container_name: knowstreaming_init
     depends_on:
       - elasticsearch-single
-    links:
-      - elasticsearch-single
     environment:
       TZ: Asia/Shanghai
       SERVER_ES_ADDRESS: elasticsearch-single:9200
-    networks:
-      - ks
+
 
   knowstreaming-mysql:
     image: haiti/knowstreaming-mysql:0.1.0
@@ -88,13 +76,7 @@ services:
       TZ: Asia/Shanghai
       MYSQL_ROOT_PASSWORD: admin2022_
       MYSQL_DATABASE: know_streaming
-    networks:
-      - ks
     expose:
       - 3306
 #    volumes:
-#      - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql
-
-networks:
-  ks:
-    driver: bridge
+#      - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql

km-dist/docker/knowstreaming-manage/Dockerfile

@@ -34,3 +34,5 @@ RUN curl -fsSLO --compressed "https://dlcdn.apache.org/maven/maven-3/${VERSION_M
   && rm -rf /root/.m2 /tmp/*
 
 ENTRYPOINT ["/bin/bash","/start.sh"]
+
+HEALTHCHECK --interval=60s --timeout=60s CMD curl -f http://localhost/ks-km/api/v3/open/health || exit 1