Merge branch 'dtm' into v2.3.0release

# Conflicts:
#	internal/rpc/group/group.go
This commit is contained in:
wangchuxiao
2022-07-21 10:41:48 +08:00
57 changed files with 1474 additions and 2422 deletions
+13
View File
@@ -113,6 +113,18 @@ services:
restart: always
command: minio server /data --console-address ':9090'
dtm:
image: yedf/dtm
ports:
- 36789:36789
- 36790:36790
environment:
STORE_DRIVER: mysql
STORE_HOST: localhost
STORE_USER: root
STORE_PASSWORD: ''
STORE_PORT: 3306
open_im_server:
image: openim/open_im_server:v2.3.0-rc0
container_name: open_im_server
@@ -129,6 +141,7 @@ services:
- redis
- etcd
- minio
- dtm
network_mode: "host"
logging:
driver: json-file