From efeb394f3e98ddf940ae40d8369fb6cf23e38696 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 9 Oct 2022 11:53:46 +0800 Subject: [PATCH 01/10] k8s deploy --- deploy_k8s/admin_cms/deployment.yaml | 2 +- deploy_k8s/api/deployment.yaml | 2 +- deploy_k8s/auth/deployment.yaml | 2 +- deploy_k8s/cache/deployment.yaml | 2 +- deploy_k8s/cms_api/deployment.yaml | 2 +- deploy_k8s/conversation/deployment.yaml | 2 +- deploy_k8s/demo/deployment.yaml | 2 +- deploy_k8s/friend/deployment.yaml | 2 +- deploy_k8s/group/deployment.yaml | 2 +- deploy_k8s/msg/deployment.yaml | 2 +- deploy_k8s/msg_gateway/deployment.yaml | 2 +- deploy_k8s/msg_transfer/deployment.yaml | 2 +- deploy_k8s/office/deployment.yaml | 2 +- deploy_k8s/organization/deployment.yaml | 2 +- deploy_k8s/push/deployment.yaml | 2 +- deploy_k8s/sdk_server/deployment.yaml | 2 +- deploy_k8s/user/deployment.yaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 369cee350..b74ddb332 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -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 diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index e99cf0e76..1e341d708 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -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 diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 0285ef815..94935eaa0 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -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 diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index b8b3d6244..f29de1c75 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -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 diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index e3da1cb62..8cc1f5af7 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -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 diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 885d92c4b..9dc06dc41 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -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 diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index a23abb0b2..14fd581ad 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -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 diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index b57d19f73..626353a6a 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -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 diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 99837b758..22971b936 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -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 diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index e95eb6279..1ecc6f623 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -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 diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index fc3ff94d5..f28a29d5b 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -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 diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index 36af35219..f647fe23b 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -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 diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 2dd1c1ec1..950166a41 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -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 diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 67f21ffca..6b3e86bee 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -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 diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 0b8603bf0..9078eec6a 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -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 diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index f10782220..c605d16c0 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -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 diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 498a6301d..805b710a5 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -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 From 329d475106860b73707ed5f5d5a2d5d634a8100c Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 4 Nov 2022 15:00:28 +0800 Subject: [PATCH 02/10] limit memory --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6cf32b5a1..3e932ee60 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -81,6 +81,7 @@ services: KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE + KAFKA_HEAP_OPTS: "-Xmx512M -Xms256M" depends_on: - zookeeper From 624014572cf49fc0b653858b167a9616b29802d0 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 8 Nov 2022 17:06:18 +0800 Subject: [PATCH 03/10] Optimize the configuration --- .env | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 000000000..17f7ebb68 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +USER=root +PASSWORD=openIM +DATA_DIR=./ \ No newline at end of file From b06b8e4d2ba86eb9e126f80863acf28d3e21aadb Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 8 Nov 2022 17:10:27 +0800 Subject: [PATCH 04/10] Optimize the configuration --- docker-compose.yaml | 55 ++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3e932ee60..1581b3eed 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,5 @@ -version: "3" #fixme Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git - +version: "3" services: mysql: image: mysql:5.7 @@ -9,10 +8,10 @@ services: - 23306:33060 container_name: mysql volumes: - - ./components/mysql/data:/var/lib/mysql + - ${DATA_DIR}/components/mysql/data:/var/lib/mysql - /etc/localtime:/etc/localtime environment: - MYSQL_ROOT_PASSWORD: openIM + MYSQL_ROOT_PASSWORD: ${PASSWORD} restart: always mongodb: @@ -22,19 +21,17 @@ services: container_name: mongo command: --wiredTigerCacheSizeGB 1 volumes: - - ./components/mongodb/data/db:/data/db - - ./components/mongodb/data/logs:/data/logs - - ./components/mongodb/data/conf:/etc/mongo - # - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh + - ${DATA_DIR}/components/mongodb/data/db:/data/db + - ${DATA_DIR}/components/mongodb/data/logs:/data/logs + - ${DATA_DIR}/components/mongodb/data/conf:/etc/mongo + - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro environment: - TZ=Asia/Shanghai # cache - wiredTigerCacheSizeGB=1 - # - MONGO_USERNAME=openIM - # - MONGO_PASSWORD=openIM - # - MONGO_INITDB_ROOT_USERNAME=root - # - MONGO_INITDB_ROOT_PASSWORD=root - # - MONGO_INITDB_DATABASE=openIM + - MONGO_INITDB_ROOT_USERNAME=${USER} + - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD} + - MONGO_INITDB_DATABASE=openIM restart: always redis: @@ -43,15 +40,15 @@ services: - 16379:6379 container_name: redis volumes: - - ./components/redis/data:/data + - ${DATA_DIR}/components/redis/data:/data #redis config file - - ./components/redis/config/redis.conf:/usr/local/redis/config/redis.conf + - ${DATA_DIR}/components/redis/config/redis.conf:/usr/local/redis/config/redis.conf environment: TZ: Asia/Shanghai restart: always sysctls: net.core.somaxconn: 1024 - command: redis-server --requirepass openIM --appendonly yes + command: redis-server --requirepass ${PASSWORD} --appendonly yes zookeeper: @@ -81,7 +78,6 @@ services: KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE - KAFKA_HEAP_OPTS: "-Xmx512M -Xms256M" depends_on: - zookeeper @@ -109,19 +105,19 @@ services: - /mnt/data:/data - /mnt/config:/root/.minio environment: - MINIO_ROOT_USER: user12345 - MINIO_ROOT_PASSWORD: key12345 + MINIO_ROOT_USER: ${USER} + MINIO_ROOT_PASSWORD: ${PASSWORD} restart: always command: minio server /data --console-address ':9090' open_im_server: - image: openim/open_im_server:v2.3.3 + image: openim/open_im_server:v2.3.2 container_name: open_im_server volumes: - ./logs:/Open-IM-Server/logs - ./config/config.yaml:/Open-IM-Server/config/config.yaml - - ./db/sdk:/Open-IM-Server/db/sdk + - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk - ./script:/Open-IM-Server/script restart: always depends_on: @@ -141,8 +137,8 @@ services: prometheus: image: prom/prometheus volumes: - - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml - # - ./components/prometheus_data:/prometheus + - ${DATA_DIR}/docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml + # - ${DATA_DIR}/components/prometheus_data:/prometheus container_name: prometheus ports: - 9091:9091 @@ -154,20 +150,17 @@ services: grafana: image: grafana/grafana volumes: - - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml - - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini - # - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json - # - ./components/grafana:/var/lib/grafana - - ./docker-compose_cfg/grafana.db:/var/lib/grafana/grafana.db + # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json + # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml + - ${DATA_DIR}/docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml + - ${DATA_DIR}/docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini + - ${DATA_DIR}/docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json container_name: grafana ports: - 10007:10007 depends_on: - prometheus network_mode: "host" - privileged: true - user: root - # -rw-r----- node-exporter: image: quay.io/prometheus/node-exporter From f6b549678dbc943323ad6d1c47f29d8153d4b344 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 9 Nov 2022 10:40:50 +0800 Subject: [PATCH 05/10] fix k8s --- deploy_k8s/sdk_server/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index c605d16c0..a26d654df 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -29,7 +29,7 @@ spec: - name: CONFIG_NAME value: "/Open-IM-Server" command: ["/Open-IM-Server/main"] - args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10001", "-openIM_api_address", "api_address", "-openIM_log_level", "6"] + args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10003", "-openIM_api_address", "api_address", "-openIM_log_level", "6"] volumes: - name: config configMap: From d92aca5b166c36ed5fde16b26d0a6f9e1c985a7f Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 12:06:07 +0800 Subject: [PATCH 06/10] Optimize the script --- init_docker.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 init_docker.sh diff --git a/init_docker.sh b/init_docker.sh new file mode 100644 index 000000000..aa188d65f --- /dev/null +++ b/init_docker.sh @@ -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 From c639cf7162efa82064db5e2e9b8479fe95f025a1 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 12:07:17 +0800 Subject: [PATCH 07/10] 2.3.4 --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1581b3eed..1edc08967 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -112,7 +112,7 @@ services: open_im_server: - image: openim/open_im_server:v2.3.2 + image: openim/open_im_server:v2.3.4 container_name: open_im_server volumes: - ./logs:/Open-IM-Server/logs From decef23751130fdda5761058375331bfb5e1f575 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 12:36:55 +0800 Subject: [PATCH 08/10] config --- config/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 01285a682..08bc152a7 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -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 * * * From 935f80cd8abf398800806d34bbbfdd75ab943d4e Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 15:52:01 +0800 Subject: [PATCH 09/10] install_im_server --- docker-compose.yaml | 5 ++++- install_im_server.sh | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 install_im_server.sh diff --git a/docker-compose.yaml b/docker-compose.yaml index 1edc08967..e8817acf6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -19,7 +19,7 @@ services: ports: - 37017:27017 container_name: mongo - command: --wiredTigerCacheSizeGB 1 + command: --wiredTigerCacheSizeGB 1 --auth volumes: - ${DATA_DIR}/components/mongodb/data/db:/data/db - ${DATA_DIR}/components/mongodb/data/logs:/data/logs @@ -32,6 +32,9 @@ services: - MONGO_INITDB_ROOT_USERNAME=${USER} - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD} - MONGO_INITDB_DATABASE=openIM + - MONGO_USERNAME=${USER} + - MONGO_PASSWORD=${PASSWORD} + # restart: always redis: diff --git a/install_im_server.sh b/install_im_server.sh new file mode 100644 index 000000000..aa188d65f --- /dev/null +++ b/install_im_server.sh @@ -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 From 322ec268293ab9898e1eadd6c8c1fce9bb29ec39 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 9 Nov 2022 15:52:59 +0800 Subject: [PATCH 10/10] install_im_server --- script/.env | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 script/.env diff --git a/script/.env b/script/.env new file mode 100644 index 000000000..17f7ebb68 --- /dev/null +++ b/script/.env @@ -0,0 +1,3 @@ +USER=root +PASSWORD=openIM +DATA_DIR=./ \ No newline at end of file