Merge branch 'main' into main

docker-compose.yaml

@@ -52,7 +52,6 @@ services:
       net.core.somaxconn: 1024
     command: redis-server --requirepass ${PASSWORD} --appendonly yes
 
-
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
@@ -65,7 +64,6 @@ services:
     restart: always
     network_mode: "host"
 
-
   kafka:
     image: wurstmeister/kafka
     container_name: kafka
@@ -100,16 +98,13 @@ services:
     restart: always
     command: minio server /data --console-address ':9090'
 
-
-  openim_server:
+  openim-server:
     image: ghcr.io/openimsdk/openim-server:latest
     container_name: openim-server
     volumes:
-      - ./logs:/Open-IM-Server/logs
-      - ./config/config.yaml:/Open-IM-Server/config/config.yaml
-      - ./config/notification.yaml:/Open-IM-Server/config/notification.yaml
-      - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk
-      - ./scripts:/Open-IM-Server/scripts
+      - ./logs:/openim/openim-server/logs
+      - ./config:/openim/openim-server/config
+      - ./scripts:/openim/openim-server/scripts
     restart: always
     depends_on:
       - zookeeper
@@ -125,16 +120,20 @@ services:
         max-size: "1g"
         max-file: "2"
 
-  openim_chat:
+  openim-chat:
     image: ghcr.io/openimsdk/openim-chat:latest
-    container_name: openim_chat
+    container_name: openim-chat
+    volumes:
+      - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
+      - ./_output/openim/openim-chat/config:/openim/openim-chat/config
+      - ./_output/openim/openim-chat/scripts:/openim/openim-chat/scripts
     restart: always
     depends_on:
       - mysql
       - mongodb
       - redis
       - minio
-      - openim_server
+      - openim-server
     network_mode: "host"
     logging:
       driver: json-file
@@ -150,7 +149,7 @@ services:
     #    ports:
     #    - 9091:9091
     depends_on:
-    - openim_server
+    - openim-server
     command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
     network_mode: "host"