From 27d1b92690be3762466ae9bbbc7d64c4c8d45c7f Mon Sep 17 00:00:00 2001 From: haoqi <1148648445@qq.com> Date: Thu, 15 Sep 2022 16:22:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0init=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E7=94=A8=E4=BA=8E=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?es=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- km-dist/docker/docker-compose.yml | 17 ++++++++++++++--- km-dist/docker/knowstreaming-init/Dockerfile | 9 +++++++++ .../init/ks_kafka_broker_metric | 0 .../init/ks_kafka_cluster_metric | 0 .../init/ks_kafka_group_metric | 0 .../init/ks_kafka_partition_metric | 0 .../init/ks_kafka_replication_metric | 0 .../init/ks_kafka_topic_metric | 0 .../init/template.sh | 0 km-dist/docker/knowstreaming-manage/Dockerfile | 7 +++---- .../docker/knowstreaming-manage/init/start.sh | 2 -- 11 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 km-dist/docker/knowstreaming-init/Dockerfile rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/ks_kafka_broker_metric (100%) rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/ks_kafka_cluster_metric (100%) rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/ks_kafka_group_metric (100%) rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/ks_kafka_partition_metric (100%) rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/ks_kafka_replication_metric (100%) rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/ks_kafka_topic_metric (100%) rename km-dist/docker/{knowstreaming-manage => knowstreaming-init}/init/template.sh (100%) diff --git a/km-dist/docker/docker-compose.yml b/km-dist/docker/docker-compose.yml index 3ea2655d..446129ec 100644 --- a/km-dist/docker/docker-compose.yml +++ b/km-dist/docker/docker-compose.yml @@ -68,7 +68,18 @@ services: # - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data networks: - ks - + esinit: + image: esinit:1.0 + container_name: esinit + depends_on: + - elasticsearch_single + links: + - elasticsearch_single + environment: + TZ: Asia/Shanghai + SERVER_ES_ADDRESS: elasticsearch_single:9200 + networks: + - ks kmysql: image: ks_mysql:1.0 @@ -84,8 +95,8 @@ services: - 3306 # 数据文件持久化路径 # 记录添加的集群基本信息 - volumes: - - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql +# volumes: +# - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql networks: ks: diff --git a/km-dist/docker/knowstreaming-init/Dockerfile b/km-dist/docker/knowstreaming-init/Dockerfile new file mode 100644 index 00000000..8f47558c --- /dev/null +++ b/km-dist/docker/knowstreaming-init/Dockerfile @@ -0,0 +1,9 @@ +FROM debian:stable-20220912-slim +LABEL org.opencontainers.image.authors="haoqi123" +ENV INIT_ES_FILE=./init/* +COPY ${INIT_ES_FILE} / + +RUN apt-get update \ + && apt-get install -y curl + +ENTRYPOINT ["/bin/bash","/template.sh","start"] \ No newline at end of file diff --git a/km-dist/docker/knowstreaming-manage/init/ks_kafka_broker_metric b/km-dist/docker/knowstreaming-init/init/ks_kafka_broker_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/ks_kafka_broker_metric rename to km-dist/docker/knowstreaming-init/init/ks_kafka_broker_metric diff --git a/km-dist/docker/knowstreaming-manage/init/ks_kafka_cluster_metric b/km-dist/docker/knowstreaming-init/init/ks_kafka_cluster_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/ks_kafka_cluster_metric rename to km-dist/docker/knowstreaming-init/init/ks_kafka_cluster_metric diff --git a/km-dist/docker/knowstreaming-manage/init/ks_kafka_group_metric b/km-dist/docker/knowstreaming-init/init/ks_kafka_group_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/ks_kafka_group_metric rename to km-dist/docker/knowstreaming-init/init/ks_kafka_group_metric diff --git a/km-dist/docker/knowstreaming-manage/init/ks_kafka_partition_metric b/km-dist/docker/knowstreaming-init/init/ks_kafka_partition_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/ks_kafka_partition_metric rename to km-dist/docker/knowstreaming-init/init/ks_kafka_partition_metric diff --git a/km-dist/docker/knowstreaming-manage/init/ks_kafka_replication_metric b/km-dist/docker/knowstreaming-init/init/ks_kafka_replication_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/ks_kafka_replication_metric rename to km-dist/docker/knowstreaming-init/init/ks_kafka_replication_metric diff --git a/km-dist/docker/knowstreaming-manage/init/ks_kafka_topic_metric b/km-dist/docker/knowstreaming-init/init/ks_kafka_topic_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/ks_kafka_topic_metric rename to km-dist/docker/knowstreaming-init/init/ks_kafka_topic_metric diff --git a/km-dist/docker/knowstreaming-manage/init/template.sh b/km-dist/docker/knowstreaming-init/init/template.sh similarity index 100% rename from km-dist/docker/knowstreaming-manage/init/template.sh rename to km-dist/docker/knowstreaming-init/init/template.sh diff --git a/km-dist/docker/knowstreaming-manage/Dockerfile b/km-dist/docker/knowstreaming-manage/Dockerfile index e22f25d4..c73fd07d 100644 --- a/km-dist/docker/knowstreaming-manage/Dockerfile +++ b/km-dist/docker/knowstreaming-manage/Dockerfile @@ -5,11 +5,10 @@ LABEL org.opencontainers.image.authors="haoqi123" EXPOSE 80 ENV JAR_FILE=./jar/*.jar -ENV INIT_ES_FILE=./init/* +ENV INIT_FILE=./init/* ENV CONFIG_FILE=./conf/* COPY ${JAR_FILE} /app/app.jar -COPY ${INIT_ES_FILE} / +COPY ${INIT_FILE} / COPY ${CONFIG_FILE} /conf/ -ENTRYPOINT ["/bin/bash","/start.sh"] -CMD ["/bin/bash","/start.sh"] \ No newline at end of file +ENTRYPOINT ["/bin/bash","/start.sh"] \ No newline at end of file diff --git a/km-dist/docker/knowstreaming-manage/init/start.sh b/km-dist/docker/knowstreaming-manage/init/start.sh index db322fab..9741d7cf 100644 --- a/km-dist/docker/knowstreaming-manage/init/start.sh +++ b/km-dist/docker/knowstreaming-manage/init/start.sh @@ -1,5 +1,3 @@ -/bin/bash /template.sh start - sed -i "s/SERVER_MYSQL_ADDRESS/${SERVER_MYSQL_ADDRESS}/g" /conf/application.yml sed -i "s/SERVER_MYSQL_DB/${SERVER_MYSQL_DB}/g" /conf/application.yml sed -i "s/SERVER_MYSQL_USER/${SERVER_MYSQL_USER}/g" /conf/application.yml