Skip to content

Commit f64808e

Browse files
authored
Merge pull request #201 from mo3et/build/remove-script
build: remove script create mongo and kafka.
2 parents d9771f0 + 845d199 commit f64808e

File tree

5 files changed

+42
-134
lines changed

5 files changed

+42
-134
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Docker images
2-
MONGO_IMAGE=mongo:6.0.2 # MongoDB server image version
2+
MONGO_IMAGE=mongo:7.0 # MongoDB server image version
33
REDIS_IMAGE=redis:7.0.0 # Redis server image version
44
KAFKA_IMAGE=bitnami/kafka:3.5.1 # Kafka server image version
55
MINIO_IMAGE=minio/minio:RELEASE.2024-01-11T07-46-16Z # MinIO server image version
@@ -14,7 +14,7 @@ OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.2
1414
NODE_EXPORTER_IMAGE=prom/node-exporter:v1.7.0 # Prometheus Node Exporter image version
1515

1616
# OpenIM server and chat service images
17-
OPENIM_SERVER_IMAGE=openim/openim-server:release-v3.8.1 # OpenIM server application image version
17+
OPENIM_SERVER_IMAGE=openim/openim-server:release-v3.8.2 # OpenIM server application image version
1818
#OPENIM_SERVER_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:release-v3.8.1
1919

2020
OPENIM_CHAT_IMAGE=openim/openim-chat:v1.8.2 # OpenIM chat application image version

docker-compose.yaml

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,35 @@ services:
66
mongo:
77
image: "${MONGO_IMAGE}"
88
container_name: mongo
9-
command: ["/bin/bash", "-c", "/docker-entrypoint-initdb.d/mongo-init.sh; docker-entrypoint.sh mongod --wiredTigerCacheSizeGB 1 --auth"]
9+
command: >
10+
bash -c '
11+
docker-entrypoint.sh mongod --wiredTigerCacheSizeGB $$wiredTigerCacheSizeGB --auth &
12+
until mongosh -u $$MONGO_INITDB_ROOT_USERNAME -p $$MONGO_INITDB_ROOT_PASSWORD --authenticationDatabase admin --eval "db.runCommand({ ping: 1 })" &>/dev/null; do
13+
echo "Waiting for MongoDB to start..."
14+
sleep 1
15+
done &&
16+
mongosh -u $$MONGO_INITDB_ROOT_USERNAME -p $$MONGO_INITDB_ROOT_PASSWORD --authenticationDatabase admin --eval "
17+
db = db.getSiblingDB(\"$$MONGO_INITDB_DATABASE\");
18+
if (!db.getUser(\"$$MONGO_OPENIM_USERNAME\")) {
19+
db.createUser({
20+
user: \"$$MONGO_OPENIM_USERNAME\",
21+
pwd: \"$$MONGO_OPENIM_PASSWORD\",
22+
roles: [{role: \"readWrite\", db: \"$$MONGO_INITDB_DATABASE\"}]
23+
});
24+
print(\"User created successfully: \");
25+
print(\"Username: $$MONGO_OPENIM_USERNAME\");
26+
print(\"Password: $$MONGO_OPENIM_PASSWORD\");
27+
print(\"Database: $$MONGO_INITDB_DATABASE\");
28+
} else {
29+
print(\"User already exists in database: $$MONGO_INITDB_DATABASE, Username: $$MONGO_OPENIM_USERNAME\");
30+
}
31+
" &&
32+
tail -f /dev/null
33+
'
1034
volumes:
1135
- "${DATA_DIR}/components/mongodb/data/db:/data/db"
1236
- "${DATA_DIR}/components/mongodb/data/logs:/data/logs"
1337
- "${DATA_DIR}/components/mongodb/data/conf:/etc/mongo"
14-
- "./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro"
1538
environment:
1639
- TZ=Asia/Shanghai
1740
- wiredTigerCacheSizeGB=1
@@ -65,10 +88,7 @@ services:
6588
user: root
6689
restart: always
6790
volumes:
68-
- ./scripts/create-topic.sh:/opt/bitnami/kafka/create-topic.sh
6991
- "${DATA_DIR}/components/kafka:/bitnami/kafka"
70-
command: >
71-
bash -c "/opt/bitnami/scripts/kafka/run.sh & /opt/bitnami/kafka/create-topic.sh; wait"
7292
environment:
7393
TZ: Asia/Shanghai
7494
KAFKA_CFG_NODE_ID: 0
@@ -78,6 +98,8 @@ services:
7898
KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,EXTERNAL://kafka:9094
7999
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
80100
KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
101+
KAFKA_NUM_PARTITIONS: 8
102+
KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true"
81103
networks:
82104
- openim
83105

@@ -205,6 +227,12 @@ services:
205227
- IMENV_LOG_REMAINLOGLEVEL=${LOG_LEVEL}
206228
- IMENV_OPENIM_API_PROMETHEUS_GRAFANAURL=${GRAFANA_URL}
207229
restart: always
230+
depends_on:
231+
- mongo
232+
- redis
233+
- etcd
234+
- kafka
235+
- minio
208236
networks:
209237
- openim
210238

@@ -232,5 +260,12 @@ services:
232260
- "${CHAT_API_PORT}:10008"
233261
- "${ADMIN_API_PORT}:10009"
234262
restart: always
263+
depends_on:
264+
- mongo
265+
- redis
266+
- etcd
267+
- kafka
268+
- minio
269+
- openim-server
235270
networks:
236271
- openim

scripts/.spelling_failures

Lines changed: 0 additions & 6 deletions
This file was deleted.

scripts/create-topic.sh

Lines changed: 0 additions & 55 deletions
This file was deleted.

scripts/mongo-init.sh

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)