Skip to content

Commit 7b0b693

Browse files
author
haoqi
committed
1. 调整docker-compose.yml中容器名称
1 parent 227479f commit 7b0b693

File tree

4 files changed

+21
-24
lines changed

4 files changed

+21
-24
lines changed

km-dist/docker/docker-compose.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ version: "3"
33
services:
44

55
knowstreaming-manager:
6-
image: km_manage:1.1
6+
image: knowstreaming-manager:0.1.0
77
container_name: knowstreaming-manager
88
privileged: true
99
restart: always
1010
depends_on:
1111
- elasticsearch_single
12-
- kmysql
12+
- knowstreaming_mysql
1313
links:
1414
- elasticsearch_single
15-
- kmysql
15+
- knowstreaming_mysql
1616
expose:
1717
- 80
1818
environment:
1919
TZ: Asia/Shanghai
2020

21-
SERVER_MYSQL_ADDRESS: kmysql:3306
21+
SERVER_MYSQL_ADDRESS: knowstreaming_mysql:3306
2222
SERVER_MYSQL_DB: know_streaming
2323
SERVER_MYSQL_USER: root
2424
SERVER_MYSQL_PASSWORD: admin2022_
@@ -28,11 +28,10 @@ services:
2828
JAVA_OPTS: -Xmx1g -Xms1g
2929
networks:
3030
- ks
31-
# 日志文件持久化路径
3231
# volumes:
3332
# - /Users/haoqi/Downloads/ks/manage/log:/logs
3433
knowstreaming-ui:
35-
image: km:1.0
34+
image: knowstreaming-ui:0.1.0
3635
container_name: knowstreaming-ui
3736
restart: always
3837
ports:
@@ -54,23 +53,20 @@ services:
5453
expose:
5554
- 9200
5655
- 9300
57-
# 对外访问
58-
# ports:
59-
# - '9200:9200'
60-
# - '9300:9300'
56+
ports:
57+
- '9200:9200'
58+
- '9300:9300'
6159
environment:
6260
TZ: Asia/Shanghai
6361
ES_JAVA_OPTS: -Xms512m -Xmx512m
6462
discovery.type: single-node
65-
# 数据文件持久化路径
66-
# 记录实时指标信息
6763
# volumes:
6864
# - /Users/haoqi/Downloads/ks/es/data:/usr/share/elasticsearch/data
6965
networks:
7066
- ks
71-
esinit:
72-
image: esinit:1.0
73-
container_name: esinit
67+
knowstreaming_init:
68+
image: knowstreaming-init:0.1.0
69+
container_name: knowstreaming_init
7470
depends_on:
7571
- elasticsearch_single
7672
links:
@@ -81,9 +77,9 @@ services:
8177
networks:
8278
- ks
8379

84-
kmysql:
85-
image: ks_mysql:1.0
86-
container_name: kmysql
80+
knowstreaming_mysql:
81+
image: knowstreaming-mysql:0.1.0
82+
container_name: knowstreaming_mysql
8783
restart: always
8884
environment:
8985
TZ: Asia/Shanghai
@@ -93,8 +89,6 @@ services:
9389
- ks
9490
expose:
9591
- 3306
96-
# 数据文件持久化路径
97-
# 记录添加的集群基本信息
9892
# volumes:
9993
# - /Users/haoqi/Downloads/ks/mysql/data:/data/mysql
10094

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
FROM centos:7.9.2009
1+
FROM debian:stable-20220912-slim
22
LABEL org.opencontainers.image.authors="haoqi123"
33
ARG INIT_ES_FILE=./init/*
44
COPY ${INIT_ES_FILE} /
55
ENV TZ=Asia/Shanghai
66

7-
ENTRYPOINT ["/bin/sh","/template.sh","start"]
7+
RUN apt-get update \
8+
&& apt-get install -y curl
9+
10+
ENTRYPOINT ["/bin/bash","/template.sh","start"]

km-dist/docker/knowstreaming-init/init/template.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
echo "Wait ElasticSearch Start..."
1+
echo "Wait ElasticSearch Start...${SERVER_ES_ADDRESS}"
22
while true
33
do
44
curl -s --connect-timeout 10 -o /dev/null http://${SERVER_ES_ADDRESS}/_cat/nodes > /dev/null 2>&1

km-dist/docker/knowstreaming-manage/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ RUN curl -fsSLO --compressed "https://dlcdn.apache.org/maven/maven-3/${VERSION_M
3131
&& mv /knowstreaming/KnowStreaming/km-rest/target/ks-km.jar /app/app.jar \
3232
&& rm -rf /knowstreaming/* /usr/local/bin/mvn \
3333
&& yum erase -y git && yum clean all \
34-
&& rm -rf `pwd`/.m2 /tmp/*
34+
&& rm -rf /root/.m2 /tmp/*
3535

3636
ENTRYPOINT ["/bin/bash","/start.sh"]

0 commit comments

Comments
 (0)