msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

fix: docker release v3.1.1 images optimize

Browse Source 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
pull/751/head v3.1.1-beta.1
Xinwei Xiong(cubxxw-openim) 2 years ago
parent 22c8cd7fdb
commit 8c55ad1f02
No known key found for this signature in database
GPG Key ID: 1BAD6F395338EFDE
10 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
Dockerfile
Unescape View File

@ -28,4 +28,6 @@ COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms
VOLUME ["/openim/openim-server/logs","/openim/openim-server/config","/openim/openim-server/scripts"]
CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"] CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"]

4
docker-compose.yaml
Unescape View File

@ -100,7 +100,7 @@ services:
openim_server: openim_server:
image: openim-server:v1 #ghcr.io/openimsdk/openim-server:latels image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.0 #ghcr.io/openimsdk/openim-server:latels
container_name: openim-server container_name: openim-server
volumes: volumes:
- ./logs:/openim/openim-server/logs - ./logs:/openim/openim-server/logs
@ -122,7 +122,7 @@ services:
max-file: "2" max-file: "2"
openim_chat: openim_chat:
image: openim-chat:v1.3 #ghcr.io/openimsdk/openim-chat:latels image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.0 #ghcr.io/openimsdk/openim-chat:latels
container_name: openim_chat container_name: openim_chat
# volumes: # volumes:
# - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs # - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs

12
scripts/enterprise/function.sh
Unescape View File

@ -16,12 +16,12 @@
#input:[10023,2323,3434] #input:[10023,2323,3434]
#output:10023 2323 3434 #output:10023 2323 3434
list_to_string(){ list_to_string(){
ports_list=$* ports_list=$*
sub_s1=`echo $ports_list | sed 's/ //g'` sub_s1=`echo $ports_list | sed 's/ //g'`
sub_s2=${sub_s1//,/ } sub_s2=${sub_s1//,/ }
sub_s3=${sub_s2#*[} sub_s3=${sub_s2#*[}
sub_s4=${sub_s3%]*} sub_s4=${sub_s3%]*}
ports_array=$sub_s4 ports_array=$sub_s4
} }
remove_space(){ remove_space(){
value=$* value=$*

16
scripts/enterprise/path_info.cfg
Unescape View File

@ -1,6 +1,6 @@
#Don't put the space between "=" #Don't put the space between "="
demo_server_name="openim_chat_api" demo_server_name="chat-api"
demo_server_binary_root="$BIN_DIR/" demo_server_binary_root="$BIN_DIR/"
#Global configuration file default dir #Global configuration file default dir
@ -12,16 +12,14 @@ service_source_root=(
../cmd/api/chat/ ../cmd/api/chat/
../cmd/api/admin/ ../cmd/api/admin/
#rpc service file #rpc service file
../cmd/openim-rpc/admin/ ../cmd/rpc/admin/
../cmd/openim-rpc/chat/ ../cmd/rpc/chat/
) )
#service filename #service filename
service_names=( service_names=(
#api service filename chat-api
openim_chat_api admin-api
openim_admin_api admin-rpc
#rpc service filename chat-rpc
openim_admin
openim_chat
) )

8
scripts/msg_transfer_start.sh
Unescape View File

@ -38,10 +38,10 @@ prome_ports=($ports_array)
#Check if the service exists #Check if the service exists
#If it is exists,kill this process #If it is exists,kill this process
check=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l` check=`ps | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
if [ $check -ge 1 ] if [ $check -ge 1 ]
then then
oldPid=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'` oldPid=`ps | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
kill -9 $oldPid kill -9 $oldPid
fi fi
#Waiting port recycling #Waiting port recycling
@ -59,10 +59,10 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
done done
#Check launched service process #Check launched service process
check=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l` check=`ps | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
if [ $check -ge 1 ] if [ $check -ge 1 ]
then then
newPid=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'` newPid=`ps | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
allPorts="" allPorts=""
echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX}

8
scripts/push_start.sh
Unescape View File

@ -45,9 +45,9 @@ prome_ports=($ports_array)
#Check if the service exists #Check if the service exists
#If it is exists,kill this process #If it is exists,kill this process
check=$(ps aux | grep -w ./${push_name} | grep -v grep | wc -l) check=$(ps | grep -w ./${push_name} | grep -v grep | wc -l)
if [ $check -ge 1 ]; then if [ $check -ge 1 ]; then
oldPid=$(ps aux | grep -w ./${push_name} | grep -v grep | awk '{print $2}') oldPid=$(ps | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
kill -9 $oldPid kill -9 $oldPid
fi fi
#Waiting port recycling #Waiting port recycling
@ -61,9 +61,9 @@ done
sleep 3 sleep 3
#Check launched service process #Check launched service process
check=$(ps aux | grep -w ./${push_name} | grep -v grep | wc -l) check=$(ps | grep -w ./${push_name} | grep -v grep | wc -l)
if [ $check -ge 1 ]; then if [ $check -ge 1 ]; then
newPid=$(ps aux | grep -w ./${push_name} | grep -v grep | awk '{print $2}') newPid=$(ps | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
ports=$(netstat -netulp | grep -w ${newPid} | awk '{print $4}' | awk -F '[:]' '{print $NF}') ports=$(netstat -netulp | grep -w ${newPid} | awk '{print $4}' | awk -F '[:]' '{print $NF}')
allPorts="" allPorts=""

8
scripts/start_all.sh
Unescape View File

@ -27,15 +27,15 @@ source $SCRIPTS_ROOT/function.sh
cd $SCRIPTS_ROOT cd $SCRIPTS_ROOT
echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
if [ ! -d "${OPENIM_ROOT}/_output/bin/platforms" ]; then if [ ! -d "${OPENIM_ROOT}/_output/bin/platforms" ]; then
# exec build_all_service.sh # exec build_all_service.sh
"${SCRIPTS_ROOT}/build_all_service.sh" "${SCRIPTS_ROOT}/build_all_service.sh"
fi fi
echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
bin_dir="$OPENIM_ROOT/_output/bin" bin_dir="$OPENIM_ROOT/_output/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"
sdk_db_dir="$OPENIM_ROOT/sdk/db/" sdk_db_dir="$OPENIM_ROOT/sdk/db/"

8
scripts/start_cron.sh
Unescape View File

@ -34,10 +34,10 @@ sdk_db_dir="$OPENIM_ROOT/sdk/db/"
#Check if the service exists #Check if the service exists
#If it is exists,kill this process #If it is exists,kill this process
check=`ps aux | grep -w ./${cron_task_name} | grep -v grep| wc -l` check=`ps | grep -w ./${cron_task_name} | grep -v grep| wc -l`
if [ $check -ge 1 ] if [ $check -ge 1 ]
then then
oldPid=`ps aux | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'` oldPid=`ps | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
kill -9 $oldPid kill -9 $oldPid
fi fi
#Waiting port recycling #Waiting port recycling
@ -50,10 +50,10 @@ nohup ./${cron_task_name} >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
#done #done
#Check launched service process #Check launched service process
check=`ps aux | grep -w ./${cron_task_name} | grep -v grep| wc -l` check=`ps | grep -w ./${cron_task_name} | grep -v grep| wc -l`
if [ $check -ge 1 ] if [ $check -ge 1 ]
then then
newPid=`ps aux | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'` newPid=`ps | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
allPorts="" allPorts=""
echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${cron_task_name}${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${cron_task_name}${COLOR_SUFFIX}

2
scripts/start_rpc_service.sh
Unescape View File

@ -74,7 +74,7 @@ service_prometheus_port_name=(
for ((i = 0; i < ${#service_filename[*]}; i++)); do for ((i = 0; i < ${#service_filename[*]}; i++)); do
#Check whether the service exists #Check whether the service exists
service_name="ps -aux |grep -w ${service_filename[$i]} |grep -v grep" service_name="ps |grep -w ${service_filename[$i]} |grep -v grep"
count="${service_name}| wc -l" count="${service_name}| wc -l"
if [ $(eval ${count}) -gt 0 ]; then if [ $(eval ${count}) -gt 0 ]; then

2
scripts/stop_all.sh
Unescape View File

@ -29,7 +29,7 @@ cd "$SCRIPTS_ROOT"
for i in ${service_names[*]}; do for i in ${service_names[*]}; do
#Check whether the service exists #Check whether the service exists
name="ps -aux |grep -w $i |grep -v grep" name="ps |grep -w $i |grep -v grep"
count="${name}| wc -l" count="${name}| wc -l"
if [ $(eval ${count}) -gt 0 ]; then if [ $(eval ${count}) -gt 0 ]; then
pid="${name}| awk '{print \$2}'" pid="${name}| awk '{print \$2}'"

Write Preview
Loading…
Cancel
Save