Skip to content

Commit 1263087

Browse files
cubxxwcubxxw
committed
release: release v1.3
Signed-off-by: Xinwei Xiong(cubxxw-openim) <[email protected]>
1 parent 4bc8d3c commit 1263087

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

‎docker-compose.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
- "${DATA_DIR}/components/mongodb/data/db:/data/db"
3737
- "${DATA_DIR}/components/mongodb/data/logs:/data/logs"
3838
- "${DATA_DIR}/components/mongodb/data/conf:/etc/mongo"
39-
- "./openim-server/${SERVER_BRANCH}/scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro"
39+
- "./scripts/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro"
4040
environment:
4141
- TZ=Asia/Shanghai
4242
- wiredTigerCacheSizeGB=1
@@ -141,7 +141,7 @@ services:
141141

142142
openim-server:
143143
# image: ghcr.io/openimsdk/openim-server:${SERVER_BRANCH}
144-
image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:${SERVER_BRANCH}
144+
image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main
145145
# image: openim/openim-server:${SERVER_BRANCH}
146146
# build: .
147147
container_name: openim-server

‎openim-server/main/scripts/install/environment.sh

+10-9
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
# This is a file that initializes variables for the automation script that initializes the config file
1717
# You need to supplement the script according to the specification.
18-
# Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/init_config.md
18+
# Read: https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/init_config.md
1919
# 格式化 bash 注释：https://tool.lu/shell/
20+
# 配置中心文档：https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md
2021

2122
OPENIM_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
2223

@@ -25,7 +26,7 @@ LOCAL_OUTPUT_ROOT=""${OPENIM_ROOT}"/${OUT_DIR:-_output}"
2526
source "${OPENIM_ROOT}/scripts/lib/init.sh"
2627

2728
#TODO: Access to the IP networks outside, or you want to use the IP network
28-
# IP=http://127.0.0.1
29+
# IP=127.0.0.1
2930
if [ -z "${IP}" ]; then
3031
IP=$(openim::util::get_server_ip)
3132
fi
@@ -41,9 +42,6 @@ function def() {
4142
eval "readonly $var_name=\"\${$var_name:-$(printf '%q' "$default_value")}\""
4243
}
4344

44-
# app要能访问到此ip和端口或域名
45-
readonly API_URL=${API_URL:-"http://${IP}:10002"}
46-
4745
# OpenIM Docker Compose 数据存储的默认路径
4846
def "DATA_DIR" "${OPENIM_ROOT}"
4947

@@ -108,14 +106,14 @@ LAST_OCTET=$((LAST_OCTET + 1))
108106
GRAFANA_NETWORK_ADDRESS=$(generate_ip)
109107

110108
###################### openim 配置 ######################
111-
# read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md
109+
# read: https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md
112110
def "OPENIM_DATA_DIR" "/data/openim"
113111
def "OPENIM_INSTALL_DIR" "/opt/openim"
114112
def "OPENIM_CONFIG_DIR" "/etc/openim"
115113
def "OPENIM_LOG_DIR" "/var/log/openim"
116114
def "CA_FILE" "${OPENIM_CONFIG_DIR}/cert/ca.pem"
117115

118-
def "OPENIM_CONFIG" ""${OPENIM_ROOT}"/config"
116+
def "OPNEIM_CONFIG" ""${OPENIM_ROOT}"/config"
119117
def "OPENIM_SERVER_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # OpenIM服务地址
120118

121119
# OpenIM Websocket端口
@@ -173,9 +171,12 @@ def "MONGO_PASSWORD" "${PASSWORD}" # MongoDB的密码
173171
def "MONGO_MAX_POOL_SIZE" "100" # 最大连接池大小
174172

175173
###################### Object 配置信息 ######################
174+
# app要能访问到此ip和端口或域名
175+
readonly API_URL=${API_URL:-"http://${IP}:${API_OPENIM_PORT}"}
176+
176177
def "OBJECT_ENABLE" "minio" # 对象是否启用
177178
# 对象的API地址
178-
readonly OBJECT_APIURL=${OBJECT_APIURL:-"http://${IP}:10002"}
179+
readonly OBJECT_APIURL=${OBJECT_APIURL:-"http://${API_URL}"}
179180
def "MINIO_BUCKET" "openim" # MinIO的存储桶名称
180181
def "MINIO_PORT" "10005" # MinIO的端口
181182
# MinIO的端点URL
@@ -184,7 +185,7 @@ readonly MINIO_ENDPOINT=${MINIO_ENDPOINT:-"http://${MINIO_ADDRESS}:${MINIO_PORT}
184185
def "MINIO_ACCESS_KEY" "${USER}" # MinIO的访问密钥ID
185186
def "MINIO_SECRET_KEY" "${PASSWORD}" # MinIO的密钥
186187
def "MINIO_SESSION_TOKEN" # MinIO的会话令牌
187-
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址 # MinIO的会话令牌
188+
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址
188189
# 腾讯云COS的存储桶URL
189190
def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
190191
def "COS_SECRET_ID" # 腾讯云COS的密钥ID

‎scripts/install/environment.sh

+10-9
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
# This is a file that initializes variables for the automation script that initializes the config file
1717
# You need to supplement the script according to the specification.
18-
# Read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/contrib/init_config.md
18+
# Read: https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/init_config.md
1919
# 格式化 bash 注释：https://tool.lu/shell/
20+
# 配置中心文档：https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/environment.md
2021

2122
OPENIM_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
2223

@@ -25,7 +26,7 @@ LOCAL_OUTPUT_ROOT=""${OPENIM_ROOT}"/${OUT_DIR:-_output}"
2526
source "${OPENIM_ROOT}/scripts/lib/init.sh"
2627

2728
#TODO: Access to the IP networks outside, or you want to use the IP network
28-
# IP=http://127.0.0.1
29+
# IP=127.0.0.1
2930
if [ -z "${IP}" ]; then
3031
IP=$(openim::util::get_server_ip)
3132
fi
@@ -41,9 +42,6 @@ function def() {
4142
eval "readonly $var_name=\"\${$var_name:-$(printf '%q' "$default_value")}\""
4243
}
4344

44-
# app要能访问到此ip和端口或域名
45-
readonly API_URL=${API_URL:-"http://${IP}:10002"}
46-
4745
# OpenIM Docker Compose 数据存储的默认路径
4846
def "DATA_DIR" "${OPENIM_ROOT}"
4947

@@ -108,14 +106,14 @@ LAST_OCTET=$((LAST_OCTET + 1))
108106
GRAFANA_NETWORK_ADDRESS=$(generate_ip)
109107

110108
###################### openim 配置 ######################
111-
# read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md
109+
# read: https://github.com/openimsdk/open-im-server/blob/main/deployment/init/README.md
112110
def "OPENIM_DATA_DIR" "/data/openim"
113111
def "OPENIM_INSTALL_DIR" "/opt/openim"
114112
def "OPENIM_CONFIG_DIR" "/etc/openim"
115113
def "OPENIM_LOG_DIR" "/var/log/openim"
116114
def "CA_FILE" "${OPENIM_CONFIG_DIR}/cert/ca.pem"
117115

118-
def "OPENIM_CONFIG" ""${OPENIM_ROOT}"/config"
116+
def "OPNEIM_CONFIG" ""${OPENIM_ROOT}"/config"
119117
def "OPENIM_SERVER_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # OpenIM服务地址
120118

121119
# OpenIM Websocket端口
@@ -173,9 +171,12 @@ def "MONGO_PASSWORD" "${PASSWORD}" # MongoDB的密码
173171
def "MONGO_MAX_POOL_SIZE" "100" # 最大连接池大小
174172

175173
###################### Object 配置信息 ######################
174+
# app要能访问到此ip和端口或域名
175+
readonly API_URL=${API_URL:-"http://${IP}:${API_OPENIM_PORT}"}
176+
176177
def "OBJECT_ENABLE" "minio" # 对象是否启用
177178
# 对象的API地址
178-
readonly OBJECT_APIURL=${OBJECT_APIURL:-"http://${IP}:10002"}
179+
readonly OBJECT_APIURL=${OBJECT_APIURL:-"http://${API_URL}"}
179180
def "MINIO_BUCKET" "openim" # MinIO的存储桶名称
180181
def "MINIO_PORT" "10005" # MinIO的端口
181182
# MinIO的端点URL
@@ -184,7 +185,7 @@ readonly MINIO_ENDPOINT=${MINIO_ENDPOINT:-"http://${MINIO_ADDRESS}:${MINIO_PORT}
184185
def "MINIO_ACCESS_KEY" "${USER}" # MinIO的访问密钥ID
185186
def "MINIO_SECRET_KEY" "${PASSWORD}" # MinIO的密钥
186187
def "MINIO_SESSION_TOKEN" # MinIO的会话令牌
187-
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址 # MinIO的会话令牌
188+
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址
188189
# 腾讯云COS的存储桶URL
189190
def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
190191
def "COS_SECRET_ID" # 腾讯云COS的密钥ID

0 commit comments

Comments
 (0)