From e0244d9ca7e8a7d8728bb915d094b11e7f8226f5 Mon Sep 17 00:00:00 2001
From: Xinwei Xiong <3293172751@qq.com>
Date: Thu, 4 Jan 2024 20:51:21 +0800
Subject: [PATCH] Update docker-start-all.sh fix MSG_TRANSFER_PROM_PORT (#1679)

* fix: fix the bug

* fix: fix the imAdmin permission and searchNoficitaion resp

* 2023 Annual Summary Reflections and Aspirations

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: dissmissGroup and lack of keyword bug (#1678)

* Update docker-start-all.sh

* Update env-template.yaml

* Update docker-start-all.sh

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Co-authored-by: luhaoling <2198702716@qq.com>
Co-authored-by: Brabem <69128477+luhaoling@users.noreply.github.com>
Co-authored-by: OpenIM Bot <124379614+kubbot@users.noreply.github.com>
---
 deployments/templates/env-template.yaml |  6 ------
 scripts/docker-start-all.sh             | 21 +--------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/deployments/templates/env-template.yaml b/deployments/templates/env-template.yaml
index bdeda054f..09349aab0 100644
--- a/deployments/templates/env-template.yaml
+++ b/deployments/templates/env-template.yaml
@@ -195,18 +195,12 @@ CHAT_IMAGE_VERSION=${CHAT_IMAGE_VERSION}
 
 # Port for the OpenIM chat API.
 # Default: OPENIM_CHAT_API_PORT=10008
-# !!! TODO: Do not change the chat port https://github.com/openimsdk/chat/issues/365
 OPENIM_CHAT_API_PORT=${OPENIM_CHAT_API_PORT}
 
 # Port for the OpenIM admin API.
 # Default: OPENIM_ADMIN_API_PORT=10009
-# !!! TODO: Do not change the chat port https://github.com/openimsdk/chat/issues/365
 OPENIM_ADMIN_API_PORT=${OPENIM_ADMIN_API_PORT}
 
-# Directory path for storing data files or related information for OpenIM chat.
-# Default: OPENIM_CHAT_DATA_DIR=./openim-chat/main
-OPENIM_CHAT_DATA_DIR=${OPENIM_CHAT_DATA_DIR}
-
 # ======================================
 # ========== OpenIM Admin ==============
 # ======================================
diff --git a/scripts/docker-start-all.sh b/scripts/docker-start-all.sh
index 85954a677..2616b7bd1 100755
--- a/scripts/docker-start-all.sh
+++ b/scripts/docker-start-all.sh
@@ -21,25 +21,6 @@ set -o pipefail
 #fixme This scripts is the total startup scripts
 #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array
 
-# Fixed ports inside the docker startup container
-export OPENIM_WS_PORT=10001
-export API_OPENIM_PORT=10002
-export API_PROM_PORT=20100
-export USER_PROM_PORT=20110
-export FRIEND_PROM_PORT=20120
-export MESSAGE_PROM_PORT=20130
-export MSG_GATEWAY_PROM_PORT=20140
-export GROUP_PROM_PORT=20150
-export AUTH_PROM_PORT=20160
-export PUSH_PROM_PORT=20170
-export CONVERSATION_PROM_PORT=20230
-export RTC_PROM_PORT=21300
-export THIRD_PROM_PORT=21301
-export MSG_TRANSFER_PROM_PORT=21400
-export MSG_TRANSFER_PROM_PORT=21401
-export MSG_TRANSFER_PROM_PORT=21402
-export MSG_TRANSFER_PROM_PORT=21403
-
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${OPENIM_ROOT}/scripts/install/common.sh"
 
@@ -55,4 +36,4 @@ sleep 5
 
 "${OPENIM_ROOT}"/scripts/check-all.sh
 
-tail -f ${LOG_FILE}
\ No newline at end of file
+tail -f ${LOG_FILE}