Merge branch 'main' into v2.3.0release

# Conflicts:
#	.env
#	install_im_server.sh
This commit is contained in:
wangchuxiao 2022-11-09 18:18:35 +08:00
commit af46999a16
21 changed files with 31 additions and 20 deletions

View File

@ -33,8 +33,8 @@ mongo:
dbTimeout: 60
dbDatabase: openIM #mongo db 默认即可
dbSource: admin
dbUserName: #mongo用户名建议先不设置
dbPassword: #mongo密码建议先不设置
dbUserName: root #mongo用户名建议先不设置
dbPassword: openIM #mongo密码建议先不设置
dbMaxPoolSize: 100
dbRetainChatRecords: 3650 #mongo保存离线消息时间根据需求修改
chatRecordsClearTime: "* * * * *" # 每天凌晨3点清除消息该配置和linux定时任务一样 清理操作建议设置在用户活跃少的时候 # 0 3 * * *

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: admin-cms
image: openim/admin_cms:v2.3.0release
image: openim/admin_cms:v2.3.3
# imagePullPolicy: Always #每次启动都重新拉取镜像
ports:
- containerPort: 10200

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: api
image: openim/api:v2.3.0release
image: openim/api:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10002

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: auth
image: openim/auth:v2.3.0release
image: openim/auth:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10160

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: cache
image: openim/cache:v2.3.0release
image: openim/cache:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10240

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: cms-api
image: openim/cms_api:v2.3.0release
image: openim/cms_api:v2.3.3
imagePullPolicy: Always
ports:
- containerPort: 10006

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: conversation
image: openim/conversation:v2.3.0release
image: openim/conversation:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10230

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: demo
image: openim/demo:v2.3.0release
image: openim/demo:v2.3.3
imagePullPolicy: Always
ports:
- containerPort: 10004

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: friend
image: openim/friend:v2.3.0release
image: openim/friend:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10120

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: group
image: openim/group:v2.3.0release
image: openim/group:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10150

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: msg
image: openim/msg:v2.3.0release
image: openim/msg:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10130

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: msg-gateway
image: openim/msg_gateway:v2.3.0release
image: openim/msg_gateway:v2.3.3
# imagePullPolicy: Always
ports:
- name: rpc-port

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: msg-transfer
image: openim/msg_transfer:v2.3.0release
image: openim/msg_transfer:v2.3.3
# imagePullPolicy: Always
volumeMounts:
- name: config

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: office
image: openim/office:v2.3.0release
image: openim/office:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10210

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: organization
image: openim/organization:v2.3.0release
image: openim/organization:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10220

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: push
image: openim/push:v2.3.0release
image: openim/push:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10170

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: sdk-server
image: openim/sdk_server:v2.3.0release
image: openim/sdk_server:v2.3.3
# imagePullPolicy: Always
ports:
- containerPort: 10003

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: user
image: openim/user:v2.3.0release
image: openim/user:v2.3.3
# imagePullPolicy: Always
volumeMounts:
- name: config

9
init_docker.sh Normal file
View File

@ -0,0 +1,9 @@
#!/usr/bin/env bash
cd script ;
chmod +x *.sh ;
./env_check.sh;
cd .. ;
docker-compose up -d;
cd script ;
./docker_check_service.sh

View File

@ -5,6 +5,5 @@ chmod +x *.sh ;
./env_check.sh;
cd .. ;
docker-compose up -d;
echo "upppp...."
cd script ;
./docker_check_service.sh

3
script/.env Normal file
View File

@ -0,0 +1,3 @@
USER=root
PASSWORD=openIM
DATA_DIR=./