diff --git a/km-dist/docker/docker-compose.yml b/km-dist/docker/docker-compose.yml index 3e902498..3ea2655d 100644 --- a/km-dist/docker/docker-compose.yml +++ b/km-dist/docker/docker-compose.yml @@ -25,11 +25,12 @@ services: SERVER_ES_ADDRESS: elasticsearch_single:9200 - JAVA_OPTS: -Xmx1g -Xms1g -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Duser.timezone=GMT+08 + JAVA_OPTS: -Xmx1g -Xms1g networks: - ks - volumes: - - /Users/haoqi/Downloads/ks/manage/log:/logs +# 日志文件持久化路径 +# volumes: +# - /Users/haoqi/Downloads/ks/manage/log:/logs knowstreaming-ui: image: ks_ui:1.0 container_name: knowstreaming-ui @@ -61,6 +62,8 @@ services: TZ: Asia/Shanghai ES_JAVA_OPTS: -Xms512m -Xmx512m discovery.type: single-node +# 数据文件持久化路径 +# 记录实时指标信息 # volumes: # - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data networks: @@ -79,6 +82,8 @@ services: - ks expose: - 3306 +# 数据文件持久化路径 +# 记录添加的集群基本信息 volumes: - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql diff --git a/km-dist/docker/knowstreaming-manage/Dockerfile b/km-dist/docker/knowstreaming-manage/Dockerfile index 05e28155..e22f25d4 100644 --- a/km-dist/docker/knowstreaming-manage/Dockerfile +++ b/km-dist/docker/knowstreaming-manage/Dockerfile @@ -1,11 +1,15 @@ -FROM bitnami/java:11 +FROM amd64/openjdk:17.0.2 + +LABEL org.opencontainers.image.authors="haoqi123" + +EXPOSE 80 + ENV JAR_FILE=./jar/*.jar -ENV INIT_ES_FILE=./esinit/* +ENV INIT_ES_FILE=./init/* ENV CONFIG_FILE=./conf/* COPY ${JAR_FILE} /app/app.jar COPY ${INIT_ES_FILE} / COPY ${CONFIG_FILE} /conf/ -ENTRYPOINT ["/bin/bash","/es.sh"] -CMD ["/bin/bash","/es.sh"] -#ENTRYPOINT java -jar /app/app.jar \ No newline at end of file +ENTRYPOINT ["/bin/bash","/start.sh"] +CMD ["/bin/bash","/start.sh"] \ No newline at end of file diff --git a/km-dist/docker/knowstreaming-manage/esinit/ks_kafka_broker_metric b/km-dist/docker/knowstreaming-manage/init/ks_kafka_broker_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/ks_kafka_broker_metric rename to km-dist/docker/knowstreaming-manage/init/ks_kafka_broker_metric diff --git a/km-dist/docker/knowstreaming-manage/esinit/ks_kafka_cluster_metric b/km-dist/docker/knowstreaming-manage/init/ks_kafka_cluster_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/ks_kafka_cluster_metric rename to km-dist/docker/knowstreaming-manage/init/ks_kafka_cluster_metric diff --git a/km-dist/docker/knowstreaming-manage/esinit/ks_kafka_group_metric b/km-dist/docker/knowstreaming-manage/init/ks_kafka_group_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/ks_kafka_group_metric rename to km-dist/docker/knowstreaming-manage/init/ks_kafka_group_metric diff --git a/km-dist/docker/knowstreaming-manage/esinit/ks_kafka_partition_metric b/km-dist/docker/knowstreaming-manage/init/ks_kafka_partition_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/ks_kafka_partition_metric rename to km-dist/docker/knowstreaming-manage/init/ks_kafka_partition_metric diff --git a/km-dist/docker/knowstreaming-manage/esinit/ks_kafka_replication_metric b/km-dist/docker/knowstreaming-manage/init/ks_kafka_replication_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/ks_kafka_replication_metric rename to km-dist/docker/knowstreaming-manage/init/ks_kafka_replication_metric diff --git a/km-dist/docker/knowstreaming-manage/esinit/ks_kafka_topic_metric b/km-dist/docker/knowstreaming-manage/init/ks_kafka_topic_metric similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/ks_kafka_topic_metric rename to km-dist/docker/knowstreaming-manage/init/ks_kafka_topic_metric diff --git a/km-dist/docker/knowstreaming-manage/esinit/es.sh b/km-dist/docker/knowstreaming-manage/init/start.sh similarity index 56% rename from km-dist/docker/knowstreaming-manage/esinit/es.sh rename to km-dist/docker/knowstreaming-manage/init/start.sh index 8d5383a9..db322fab 100644 --- a/km-dist/docker/knowstreaming-manage/esinit/es.sh +++ b/km-dist/docker/knowstreaming-manage/init/start.sh @@ -6,4 +6,10 @@ 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 ${JAVA_OPTS} -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-manage/esinit/template.sh b/km-dist/docker/knowstreaming-manage/init/template.sh similarity index 100% rename from km-dist/docker/knowstreaming-manage/esinit/template.sh rename to km-dist/docker/knowstreaming-manage/init/template.sh diff --git a/km-dist/docker/knowstreaming-mysql/Dockerfile b/km-dist/docker/knowstreaming-mysql/Dockerfile index edaf3ad8..4e6917c9 100644 --- a/km-dist/docker/knowstreaming-mysql/Dockerfile +++ b/km-dist/docker/knowstreaming-mysql/Dockerfile @@ -1,7 +1,10 @@ FROM mysql:5.7.39-oracle + +LABEL org.opencontainers.image.authors="haoqi123" + EXPOSE 3306 + ENV INIT_SOURCE_FILE=./sql/*.sql -#RUN mkdir /data/mysql -#RUN mkdir /var/lib/mysql-files +ENV MYSQL_CNF_FILE=./conf/*.cnf COPY ${INIT_SOURCE_FILE} /docker-entrypoint-initdb.d/ -COPY ./*.cnf /etc/mysql/conf.d/ \ No newline at end of file +COPY ${MYSQL_CNF_FILE} /etc/mysql/conf.d/ \ No newline at end of file diff --git a/km-dist/docker/knowstreaming-mysql/mysql.cnf b/km-dist/docker/knowstreaming-mysql/conf/mysql.cnf similarity index 100% rename from km-dist/docker/knowstreaming-mysql/mysql.cnf rename to km-dist/docker/knowstreaming-mysql/conf/mysql.cnf diff --git a/km-dist/docker/knowstreaming-web/Dockerfile b/km-dist/docker/knowstreaming-web/Dockerfile index f1bb3a19..4ec52a71 100644 --- a/km-dist/docker/knowstreaming-web/Dockerfile +++ b/km-dist/docker/knowstreaming-web/Dockerfile @@ -1,6 +1,14 @@ FROM docker.io/library/nginx:1.23.1 + +LABEL org.opencontainers.image.authors="haoqi123" + WORKDIR /pub EXPOSE 80 -COPY ./conf/*.conf /etc/nginx/conf.d/default.conf -COPY ./pub /pub -# HEALTHCHECK --interval=30s --timeout=30s CMD curl -f http://localhost/ks-km/api/v3/open/health || exit 1 \ No newline at end of file + +ENV HTML_FILE=./pub +ENV NGINX_CONF=./conf/*.conf + +COPY ${NGINX_CONF} /etc/nginx/conf.d/default.conf +COPY ${HTML_FILE} /pub + +HEALTHCHECK --interval=60s --timeout=60s CMD curl -f http://localhost/ks-km/api/v3/open/health || exit 1 \ No newline at end of file