Merge pull request #616 from wangdongfang-aden/dev

添加docker-compose部署和更新helm

Author: wangdongfang-aden

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

@@ -74,11 +74,11 @@ sh deploy_KnowStreaming-offline.sh
 ```bash
 # 相关镜像在Docker Hub都可以下载
 # 快速安装(NAMESPACE需要更改为已存在的，安装启动需要几分钟初始化请稍等~)
-helm install -n [NAMESPACE] [NAME] http://download.knowstreaming.com/charts/knowstreaming-manager-0.1.3.tgz
+helm install -n [NAMESPACE] [NAME] http://download.knowstreaming.com/charts/knowstreaming-manager-0.1.5.tgz
 
 # 获取KnowStreaming前端ui的service. 默认nodeport方式.
 # (http://nodeIP:nodeport，默认用户名密码：admin/admin2022_)
-# `v3.0.0-beta.2`版本开始，默认账号密码为`admin` / `admin`；
+# `v3.0.0-beta.2`版本开始（helm chart包版本0.1.4开始），默认账号密码为`admin` / `admin`；
 
 # 添加仓库
 helm repo add knowstreaming http://download.knowstreaming.com/charts
@@ -98,7 +98,7 @@ helm pull knowstreaming/knowstreaming-manager
 
 **安装命令**
 ```bash
-# `v3.0.0-beta.2`版本开始，默认账号密码为`admin` / `admin`；
+# `v3.0.0-beta.2`版本开始(docker镜像为0.2.0版本开始)，默认账号密码为`admin` / `admin`；
 # https://hub.docker.com/u/knowstreaming 在此处寻找最新镜像版本
 # mysql与es可以使用自己搭建的服务,调整对应配置即可
 
@@ -137,7 +137,7 @@ version: "2"
 services:
   # *不要调整knowstreaming-manager服务名称，ui中会用到
   knowstreaming-manager:
-    image: knowstreaming/knowstreaming-manager:0.2.0-test
+    image: knowstreaming/knowstreaming-manager:latest
     container_name: knowstreaming-manager
     privileged: true
     restart: always
@@ -170,7 +170,7 @@ services:
 #    volumes:
 #      - /ks/manage/log:/logs
   knowstreaming-ui:
-    image: knowstreaming/knowstreaming-ui:0.2.0-test1
+    image: knowstreaming/knowstreaming-ui:latest
     container_name: knowstreaming-ui
     restart: always
     ports:
@@ -204,7 +204,7 @@ services:
   # es初始化服务，与manager使用同一镜像
   # 首次启动es需初始化模版和索引,后续会自动创建
   knowstreaming-init:
-    image: knowstreaming/knowstreaming-manager:0.2.0-test
+    image: knowstreaming/knowstreaming-manager:latest
     container_name: knowstreaming-init
     depends_on:
       - elasticsearch-single
@@ -217,7 +217,7 @@ services:
       SERVER_ES_ADDRESS: elasticsearch-single:9200
 
   knowstreaming-mysql:
-    image: knowstreaming/knowstreaming-mysql:0.2.0-test
+    image: knowstreaming/knowstreaming-mysql:latest
     container_name: knowstreaming-mysql
     restart: always
     environment:

km-dist/docker/docker-compose.yml

@@ -0,0 +1,102 @@
+version: "2"
+services:
+  # *不要调整knowstreaming-manager服务名称，ui中会用到
+  knowstreaming-manager:
+    image: knowstreaming/knowstreaming-manager:latest
+    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
+      # mysql服务地址
+      SERVER_MYSQL_ADDRESS: knowstreaming-mysql:3306
+      # mysql数据库名
+      SERVER_MYSQL_DB: know_streaming
+      # mysql用户名
+      SERVER_MYSQL_USER: root
+      # mysql用户密码
+      SERVER_MYSQL_PASSWORD: admin2022_
+      # es服务地址
+      SERVER_ES_ADDRESS: elasticsearch-single:9200
+      # 服务JVM参数
+      JAVA_OPTS: -Xmx1g -Xms1g
+      # 对于kafka中ADVERTISED_LISTENERS填写的hostname可以通过该方式完成
+#    extra_hosts:
+#      - "hostname:x.x.x.x"
+      # 服务日志路径
+#    volumes:
+#      - /ks/manage/log:/logs
+  knowstreaming-ui:
+    image: knowstreaming/knowstreaming-ui:latest
+    container_name: knowstreaming-ui
+    restart: always
+    ports:
+      - '80: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的JVM参数
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+      # 单节点配置，多节点集群参考 https://www.elastic.co/guide/en/elasticsearch/reference/7.6/docker.html#docker-compose-file
+      discovery.type: single-node
+      # 数据持久化路径
+#    volumes:
+#      - /ks/es/data:/usr/share/elasticsearch/data
+
+  # es初始化服务，与manager使用同一镜像
+  # 首次启动es需初始化模版和索引,后续会自动创建
+  knowstreaming-init:
+    image: knowstreaming/knowstreaming-manager:latest
+    container_name: knowstreaming-init
+    depends_on:
+      - elasticsearch-single
+    command:
+      - /bin/bash
+      - /es_template_create.sh
+    environment:
+      TZ: Asia/Shanghai
+      # es服务地址
+      SERVER_ES_ADDRESS: elasticsearch-single:9200
+
+  knowstreaming-mysql:
+    image: knowstreaming/knowstreaming-mysql:latest
+    container_name: knowstreaming-mysql
+    restart: always
+    environment:
+      TZ: Asia/Shanghai
+      # root 用户密码
+      MYSQL_ROOT_PASSWORD: admin2022_
+      # 初始化时创建的数据库名称
+      MYSQL_DATABASE: know_streaming
+      # 通配所有host,可以访问远程
+      MYSQL_ROOT_HOST: '%'
+    expose:
+      - 3306
+#    ports:
+#      - '3306:3306'
+      # 数据持久化路径
+#    volumes:
+#      - /ks/mysql/data:/data/mysql

km-dist/docker/manager/dockerfile

@@ -0,0 +1,17 @@
+FROM java:8
+
+#维护者
+MAINTAINER wangdongfang <[email protected]>
+
+# 编译好的knowstreaming包
+ADD km-rest.jar /
+# docker启动脚本 helm安装不使用
+ADD ks-start.sh /
+# es初始化脚本 helm安装不使用
+ADD es_template_create.sh /
+
+RUN mkdir /conf
+# {  配置文件  helm安装不使用
+ADD application.yml /conf/
+ADD logback-spring.xml /conf/
+# }