From 121f8468d5282e6cd4aa03677d85e38ebef5b81e Mon Sep 17 00:00:00 2001
From: _haoqi <1148648445@qq.com>
Date: Fri, 16 Sep 2022 17:33:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8FLF=202.=20=E8=B0=83=E6=95=B4docker-compose?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=AE=B9=E5=99=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 km-dist/docker/docker-compose.yml             | 26 +++++++++----------
 .../docker/knowstreaming-manage/Dockerfile    |  6 ++---
 .../docker/knowstreaming-manage/init/start.sh |  8 +-----
 km-dist/docker/knowstreaming-web/Dockerfile   | 16 ++++++------
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/km-dist/docker/docker-compose.yml b/km-dist/docker/docker-compose.yml
index 1e736d31..a687fe07 100644
--- a/km-dist/docker/docker-compose.yml
+++ b/km-dist/docker/docker-compose.yml
@@ -4,26 +4,26 @@ services:
   
   knowstreaming-manager:
     image: knowstreaming-manager:0.1.0
-    container_name: knowstreaming-manager
+    container_name: knowstreaming_manager
     privileged: true
     restart: always
     depends_on:
-      - elasticsearch_single
-      - knowstreaming_mysql
+      - elasticsearch-single
+      - knowstreaming-mysql
     links:
-      - elasticsearch_single
-      - knowstreaming_mysql
+      - elasticsearch-single
+      - knowstreaming-mysql
     expose:
       - 80
     environment:
       TZ: Asia/Shanghai
 
-      SERVER_MYSQL_ADDRESS: knowstreaming_mysql:3306
+      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
+      SERVER_ES_ADDRESS: elasticsearch-single:9200
 
       JAVA_OPTS: -Xmx1g -Xms1g
     networks:
@@ -32,7 +32,7 @@ services:
 #      - /Users/haoqi/Downloads/ks/manage/log:/logs
   knowstreaming-ui:
     image: knowstreaming-ui:0.1.0
-    container_name: knowstreaming-ui
+    container_name: knowstreaming_ui
     restart: always
     ports:
       - '80:80'
@@ -46,7 +46,7 @@ services:
       - ks
 
 
-  elasticsearch_single:
+  elasticsearch-single:
     image: docker.io/library/elasticsearch:7.6.2
     container_name: elasticsearch_single
     restart: always
@@ -64,20 +64,20 @@ services:
 #      - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data
     networks:
       - ks
-  knowstreaming_init:
+  knowstreaming-init:
     image: knowstreaming-init:0.1.0
     container_name: knowstreaming_init
     depends_on:
-      - elasticsearch_single
+      - elasticsearch-single
     links:
-      - elasticsearch_single
+      - elasticsearch-single
     environment:
       TZ: Asia/Shanghai
       SERVER_ES_ADDRESS: elasticsearch_single:9200
     networks:
       - ks
 
-  knowstreaming_mysql:
+  knowstreaming-mysql:
     image: knowstreaming-mysql:0.1.0
     container_name: knowstreaming_mysql
     restart: always
diff --git a/km-dist/docker/knowstreaming-manage/Dockerfile b/km-dist/docker/knowstreaming-manage/Dockerfile
index 95c20f7a..94553bce 100644
--- a/km-dist/docker/knowstreaming-manage/Dockerfile
+++ b/km-dist/docker/knowstreaming-manage/Dockerfile
@@ -5,7 +5,7 @@ LABEL maintainer="haoqi123 <1148648445@qq.com>"
 WORKDIR /knowstreaming
 
 ARG VERSION_MAVEN=3.6.3
-ARG VERSION_KM=v3.0.0-beta.2
+ARG VERSION_KM=3.0.0-beta.2
 ARG INIT_FILE=./init/*
 ARG CONFIG_FILE=./conf/*
 
@@ -24,10 +24,10 @@ RUN curl -fsSLO --compressed "https://dlcdn.apache.org/maven/maven-3/${VERSION_M
 #  && curl -fsSLO --compressed https://github.com/didi/KnowStreaming/archive/refs/tags/${VERSION_KM}.zip \
   && git clone https://github.com/didi/KnowStreaming.git \
 #  && unzip -o -q master.zip \
-  && cd KnowStreaming && git checkout ${VERSION_KM} \
+  && cd KnowStreaming && git checkout v${VERSION_KM} \
   && sed -i "/km-console/d" ./pom.xml \
   && mvn -U clean package -Dmaven.test.skip=true \
-  && cd / \
+  && cd / && mkdir /app \
   && mv /knowstreaming/KnowStreaming/km-rest/target/ks-km.jar /app/app.jar \
   && rm -rf /knowstreaming/* /usr/local/bin/mvn \
   && yum erase -y git && yum clean all \
diff --git a/km-dist/docker/knowstreaming-manage/init/start.sh b/km-dist/docker/knowstreaming-manage/init/start.sh
index 9741d7cf..79c5d77a 100644
--- a/km-dist/docker/knowstreaming-manage/init/start.sh
+++ b/km-dist/docker/knowstreaming-manage/init/start.sh
@@ -4,10 +4,4 @@ sed -i "s/SERVER_MYSQL_USER/${SERVER_MYSQL_USER}/g" /conf/application.yml
 sed -i "s/SERVER_MYSQL_PASSWORD/${SERVER_MYSQL_PASSWORD}/g" /conf/application.yml
 sed -i "s/SERVER_ES_ADDRESS/${SERVER_ES_ADDRESS}/g" /conf/application.yml
 
-java -server ${JAVA_OPTS} \
--XX:+UseStringDeduplication \
--Dfile.encoding=UTF-8 \
--Djava.security.egd=file:/dev/./urandom \
--Duser.timezone=GMT+08 \
--XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/logs -XX:ErrorFile=/logs/jvm/hs_err_pid%p.log \
--jar /app/app.jar --spring.config.location=/conf/application.yml
\ No newline at end of file
+java -server ${JAVA_OPTS} -XX:+UseStringDeduplication -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Duser.timezone=GMT+08 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/logs -XX:ErrorFile=/logs/jvm/hs_err_pid%p.log -jar /app/app.jar --spring.config.location=/conf/application.yml
\ No newline at end of file
diff --git a/km-dist/docker/knowstreaming-web/Dockerfile b/km-dist/docker/knowstreaming-web/Dockerfile
index ef7e6b78..54b277db 100644
--- a/km-dist/docker/knowstreaming-web/Dockerfile
+++ b/km-dist/docker/knowstreaming-web/Dockerfile
@@ -4,8 +4,8 @@ LABEL maintainer="haoqi123 <1148648445@qq.com>"
 
 WORKDIR /knowstreaming
 
-ARG VERSION_NODE=v14.20.0
-ARG VERSION_KM=v3.0.0-beta.2
+ARG VERSION_NODE=14.20.0
+ARG VERSION_KM=3.0.0-beta.2
 
 # SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -59,9 +59,9 @@ RUN echo 'server { \
         } \
     }' > /etc/nginx/conf.d/default.conf
 
-RUN curl -fsSLO --compressed "https://npm.taobao.org/mirrors/node/${VERSION_NODE}/node-${VERSION_NODE}-linux-x64.tar.gz" \
+RUN curl -fsSLO --compressed "https://npm.taobao.org/mirrors/node/v${VERSION_NODE}/node-v${VERSION_NODE}-linux-x64.tar.gz" \
   && mkdir node/ \
-  && tar -zxf "node-${VERSION_NODE}-linux-x64.tar.gz" -C node/ --strip-components=1 --no-same-owner \
+  && tar -zxf "node-v${VERSION_NODE}-linux-x64.tar.gz" -C node/ --strip-components=1 --no-same-owner \
   && rm -rf /knowstreaming/*.tar.gz \
   && ln -s /knowstreaming/node/bin/node /usr/local/bin/node \
   && ln -s /knowstreaming/node/bin/npm /usr/local/bin/npm \
@@ -70,11 +70,11 @@ RUN curl -fsSLO --compressed "https://npm.taobao.org/mirrors/node/${VERSION_NODE
   && npm info underscore \
   && node --version \
   && npm --version \
-  && curl -fsSLO --compressed https://github.com/didi/KnowStreaming/archive/refs/tags/${VERSION_KM}.zip \
-  && unzip -o -q master.zip \
-  && cd KnowStreaming-master/km-console \
+  && curl -fsSLO --compressed https://github.com/didi/KnowStreaming/archive/refs/tags/v${VERSION_KM}.zip \
+  && unzip -o -q v${VERSION_KM}.zip \
+  && cd KnowStreaming-${VERSION_KM}/km-console \
   && npm install -g lerna && npm run i && npm run build \
-  && mv /knowstreaming/KnowStreaming-master/km-rest/src/main/resources/templates /pub \
+  && mv /knowstreaming/KnowStreaming-${VERSION_KM}/km-rest/src/main/resources/templates /pub \
   && npm uninstall -g lerna \
   && cd / \
   && rm -rf /knowstreaming/* /usr/local/bin/node /usr/local/bin/npm \