From 4cd2713fd667abf7a3c72115c68aecc3aca60779 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Wed, 6 Dec 2023 10:45:53 +0800
Subject: [PATCH] fix: remove docker compose mysql (#1523)
* fix: remove docker compose mysql
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* fix: remove docker compose mysql
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* fix: set openim scripts
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
* fix: add openim scripts
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
---------
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
---
deployments/README.md | 2 --
deployments/templates/chat.yaml | 13 -------------
deployments/templates/env_template.yaml | 17 -----------------
deployments/templates/openim.yaml | 20 --------------------
docs/contrib/environment.md | 13 -------------
scripts/install-im-server.sh | 4 ++--
scripts/install/common.sh | 3 ---
scripts/install/dependency.sh | 11 -----------
scripts/install/environment.sh | 15 ---------------
9 files changed, 2 insertions(+), 96 deletions(-)
diff --git a/deployments/README.md b/deployments/README.md
index b24babb31..03f6d112b 100644
--- a/deployments/README.md
+++ b/deployments/README.md
@@ -154,8 +154,6 @@ GO111MODULE=on go get github.com/roboll/helmfile@latest
```
```bash
-export MYSQL_ADDRESS=im-mysql
-export MYSQL_PORT=3306
export MONGO_ADDRESS=im-mongo
export MONGO_PORT=27017
export REDIS_ADDRESS=im-redis-master
diff --git a/deployments/templates/chat.yaml b/deployments/templates/chat.yaml
index 3c3862bce..561d45d6e 100644
--- a/deployments/templates/chat.yaml
+++ b/deployments/templates/chat.yaml
@@ -53,19 +53,6 @@ rpcRegisterName:
openImAdminName: ${OPENIM_ADMIN_NAME}
openImChatName: ${OPENIM_CHAT_NAME}
-###################### MySQL ######################
-mysql:
- # address: [ 127.0.0.1:13306 ] #目前仅支持单机
- # username: root #用户名
- # password: openIM123 #密码
- # database: openIM_v2 #不建议修改
- # maxOpenConn: 1000 #最大连接数
- # maxIdleConn: 100 #最大空闲连接数
- # maxLifeTime: 60 #连接可以重复使用的最长时间(秒)
- # logLevel: 4 #日志级别 1=slient 2=error 3=warn 4=info
- # slowThreshold: 500 #慢语句阈值 (毫秒)
- database: openim_enterprise
-
###################### Log ######################
log:
storageLocation: ../logs/ #存放目录
diff --git a/deployments/templates/env_template.yaml b/deployments/templates/env_template.yaml
index 0ace53286..4db838c8e 100644
--- a/deployments/templates/env_template.yaml
+++ b/deployments/templates/env_template.yaml
@@ -55,9 +55,6 @@ DOCKER_BRIDGE_SUBNET=${DOCKER_BRIDGE_SUBNET}
# Default: DOCKER_BRIDGE_GATEWAY=172.28.0.1
DOCKER_BRIDGE_GATEWAY=${DOCKER_BRIDGE_GATEWAY}
-# Address or hostname for the MySQL network.
-# Default: MYSQL_NETWORK_ADDRESS=172.28.0.2
-MYSQL_NETWORK_ADDRESS=${MYSQL_NETWORK_ADDRESS}
MONGO_NETWORK_ADDRESS=${MONGO_NETWORK_ADDRESS}
REDIS_NETWORK_ADDRESS=${REDIS_NETWORK_ADDRESS}
KAFKA_NETWORK_ADDRESS=${KAFKA_NETWORK_ADDRESS}
@@ -86,20 +83,6 @@ ZOOKEEPER_ADDRESS=${ZOOKEEPER_NETWORK_ADDRESS}
# Default: ZOOKEEPER_PORT=12181
ZOOKEEPER_PORT=${ZOOKEEPER_PORT}
-# ----- MySQL Configuration -----
-
-# Address or hostname for the MySQL service.
-# Default: MYSQL_ADDRESS=172.28.0.1
-MYSQL_ADDRESS=${MYSQL_NETWORK_ADDRESS}
-
-# Port on which MySQL database service is running.
-# Default: MYSQL_PORT=13306
-MYSQL_PORT=${MYSQL_PORT}
-
-# Password to authenticate with the MySQL database service.
-# Default: MYSQL_PASSWORD=openIM123
-MYSQL_PASSWORD=${MYSQL_PASSWORD}
-
# ----- MongoDB Configuration -----
# Address or hostname for the MongoDB service.
# Default: MONGO_ADDRESS=172.28.0.1
diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml
index fc90bfc2f..d822fec13 100644
--- a/deployments/templates/openim.yaml
+++ b/deployments/templates/openim.yaml
@@ -35,26 +35,6 @@ zookeeper:
username: ${ZOOKEEPER_USERNAME}
password: ${ZOOKEEPER_PASSWORD}
-###################### Mysql ######################
-# MySQL configuration
-# Currently, only single machine setup is supported
-#
-# Maximum number of open connections
-# Maximum number of idle connections
-# Maximum lifetime in seconds a connection can be reused
-# Log level: 1=slient, 2=error, 3=warn, 4=info
-# Slow query threshold in milliseconds
-mysql:
- address: [ ${MYSQL_ADDRESS}:${MYSQL_PORT} ]
- username: ${MYSQL_USERNAME}
- password: ${MYSQL_PASSWORD}
- database: ${MYSQL_DATABASE}
- maxOpenConn: ${MYSQL_MAX_OPEN_CONN}
- maxIdleConn: ${MYSQL_MAX_IDLE_CONN}
- maxLifeTime: ${MYSQL_MAX_LIFETIME}
- logLevel: ${MYSQL_LOG_LEVEL}
- slowThreshold: ${MYSQL_SLOW_THRESHOLD}
-
###################### Mongo ######################
# MongoDB configuration
# If uri is not empty, it will be used directly
diff --git a/docs/contrib/environment.md b/docs/contrib/environment.md
index 0279c750e..3dd090dcc 100644
--- a/docs/contrib/environment.md
+++ b/docs/contrib/environment.md
@@ -296,19 +296,6 @@ Feel free to explore the MinIO documentation for more advanced configurations an
| `ZOOKEEPER_USERNAME` | `""` | Username for Zookeeper. |
| `ZOOKEEPER_PASSWORD` | `""` | Password for Zookeeper. |
-### 2.6. MySQL Configuration
-
-**Description**: Configuration for MySQL, including port, address, and credentials.
-
-| Parameter | Example Value | Description |
-| ---------------- | ------------------------ | ------------------- |
-| `MYSQL_PORT` | `"13306"` | Port for MySQL. |
-| `MYSQL_ADDRESS` | Docker Bridge Gateway IP | Address for MySQL. |
-| `MYSQL_USERNAME` | User-defined | Username for MySQL. |
-| `MYSQL_PASSWORD` | User-defined | Password for MySQL. |
-
-Note: The configurations for other services (e.g., MONGO, REDIS, KAFKA, etc.) follow a similar pattern to MySQL and can be documented in a similar manner.
-
### 2.7. MongoDB Configuration
This section involves setting up MongoDB, including its port, address, and credentials.
diff --git a/scripts/install-im-server.sh b/scripts/install-im-server.sh
index 0ad3c4a3e..47db34433 100755
--- a/scripts/install-im-server.sh
+++ b/scripts/install-im-server.sh
@@ -40,11 +40,11 @@ else
DOCKER_COMPOSE_COMMAND="docker-compose"
fi
+"${OPENIM_ROOT}"/scripts/init-config.sh
pushd "${OPENIM_ROOT}"
${DOCKER_COMPOSE_COMMAND} stop
curl https://gitee.com/openimsdk/openim-docker/raw/main/example/full-openim-server-and-chat.yml -o docker-compose.yml
-"${OPENIM_ROOT}"/scripts/init-config.sh
-${DOCKER_COMPOSE_COMMAND} up --remove-orphans -d
+${DOCKER_COMPOSE_COMMAND} up -d
sleep 60
${DOCKER_COMPOSE_COMMAND} logs openim-server
${DOCKER_COMPOSE_COMMAND} ps
diff --git a/scripts/install/common.sh b/scripts/install/common.sh
index dd8bf614e..f6ee5d3ad 100755
--- a/scripts/install/common.sh
+++ b/scripts/install/common.sh
@@ -101,7 +101,6 @@ readonly OPENIM_SERVER_PORT_LISTARIES=("${OPENIM_SERVER_PORT_TARGETS[@]##*/}")
openim::common::dependency_name() {
local targets=(
- mysql
redis
zookeeper
kafka
@@ -117,13 +116,11 @@ readonly OPENIM_DEPENDENCY_TARGETS
# This function returns a list of ports for various services
# - zookeeper
# - kafka
-# - mysql
# - mongodb
# - redis
# - minio
openim::common::dependency_port() {
local targets=(
- ${MYSQL_PORT} # MySQL port
${REDIS_PORT} # Redis port
${ZOOKEEPER_PORT} # Zookeeper port
${KAFKA_PORT} # Kafka port
diff --git a/scripts/install/dependency.sh b/scripts/install/dependency.sh
index 7d6685186..bfa0909e2 100755
--- a/scripts/install/dependency.sh
+++ b/scripts/install/dependency.sh
@@ -22,17 +22,6 @@ set -o pipefail
OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P)
[[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh
-# Start MySQL service
-docker run -d \
- --name mysql \
- -p 13306:3306 \
- -p 23306:33060 \
- -v "${DATA_DIR}/components/mysql/data:/var/lib/mysql" \
- -v "/etc/localtime:/etc/localtime" \
- -e MYSQL_ROOT_PASSWORD=${PASSWORD} \
- --restart always \
- mysql:5.7
-
# Start MongoDB service
docker run -d \
--name mongo \
diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh
index b7c8a5dcb..643f621b6 100755
--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@@ -95,8 +95,6 @@ generate_ip() {
LAST_OCTET=$((LAST_OCTET + 1))
DOCKER_BRIDGE_GATEWAY=$(generate_ip)
LAST_OCTET=$((LAST_OCTET + 1))
-MYSQL_NETWORK_ADDRESS=$(generate_ip)
-LAST_OCTET=$((LAST_OCTET + 1))
MONGO_NETWORK_ADDRESS=$(generate_ip)
LAST_OCTET=$((LAST_OCTET + 1))
REDIS_NETWORK_ADDRESS=$(generate_ip)
@@ -168,19 +166,6 @@ def "ZOOKEEPER_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # Zookeeper的地址
def "ZOOKEEPER_USERNAME" "" # Zookeeper的用户名
def "ZOOKEEPER_PASSWORD" "" # Zookeeper的密码
-###################### MySQL 配置信息 ######################
-def "MYSQL_PORT" "13306" # MySQL的端口
-def "MYSQL_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # MySQL的地址
-def "MYSQL_USERNAME" "${OPENIM_USER}" # MySQL的用户名
-# MySQL的密码
-readonly MYSQL_PASSWORD=${MYSQL_PASSWORD:-"${PASSWORD}"}
-def "MYSQL_DATABASE" "${DATABASE_NAME}" # MySQL的数据库名
-def "MYSQL_MAX_OPEN_CONN" "1000" # 最大打开的连接数
-def "MYSQL_MAX_IDLE_CONN" "100" # 最大空闲连接数
-def "MYSQL_MAX_LIFETIME" "60" # 连接可以重用的最大生命周期(秒)
-def "MYSQL_LOG_LEVEL" "4" # 日志级别
-def "MYSQL_SLOW_THRESHOLD" "500" # 慢查询阈值(毫秒)
-
###################### MongoDB 配置信息 ######################
def "MONGO_URI" # MongoDB的URI
def "MONGO_PORT" "37017" # MongoDB的端口