new_815

Signed-off-by: hanzhixiao <709674996@qq.com>

Dockerfile

@@ -10,11 +10,11 @@ ENV GOPROXY=$GOPROXY
 # Set up the working directory
 WORKDIR /openim/openim-server
 
-COPY go.mod go.sum ./
-RUN go mod download
+COPY go.mod go.sum go.work go.work.sum ./
+#RUN go mod download
 
 # Copy all files to the container
-ADD . .
+ADD ../../Desktop .
 
 RUN make clean
 RUN make build
@@ -27,5 +27,6 @@ WORKDIR ${SERVER_WORKDIR}
 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}/_output/bin/platforms /openim/openim-server/_output/bin/platforms
+COPY --from=builder ${SERVER_WORKDIR}/_output/bin-tools/platforms /openim/openim-server/_output/bin-tools/platforms
 
 CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"]

docker-compose.yaml

@@ -97,7 +97,8 @@ services:
  command: minio server /data --console-address ':9090'
 
  openim-server:
- image: ghcr.io/openimsdk/openim-server:latest
+ #image: ghcr.io/openimsdk/openim-server:latest
+ build: ../../Desktop
  container_name: openim-server
  volumes:
  - ./logs:/openim/openim-server/logs

go.work

@@ -1,7 +1,8 @@
 go 1.20
 
 use (
- .
+ .
+ ./tools/component
  ./tools/infra
  ./tools/ncpu
 )

scripts/docker_start_all.sh

@@ -30,6 +30,15 @@ need_to_start_server_shell=(
  ${SCRIPTS_ROOT}/start_cron.sh
 )
 
+component_check=start_component_check.sh
+chmod +x $SCRIPTS_ROOT/$component_check
+$SCRIPTS_ROOT/$component_check
+if [ $? -ne 0 ]; then
+ # Print error message and exit
+ echo "${BOLD_PREFIX}${RED_PREFIX}Error executing ${component_check}. Exiting...${COLOR_SUFFIX}"
+ exit -1
+fi
+
 #fixme The 10 second delay to start the project is for the docker-compose one-click to start openIM when the infrastructure dependencies are not started
 
 sleep 10

scripts/start_all.sh

@@ -77,6 +77,19 @@ need_to_start_server_shell=(
  start_cron.sh
 )
 
+component_check=start_component_check.sh
+echo -e ""
+chmod +x $component_check
+echo -e "=========> ${BACKGROUND_GREEN}Executing ${component_check}...${COLOR_SUFFIX}"
+echo -e ""
+./$component_check
+if [ $? -ne 0 ]; then
+ # Print error message and exit
+ echo -e "${BOLD_PREFIX}${RED_PREFIX}Error executing ${component_check}. Exiting...${COLOR_SUFFIX}"
+ exit -1
+fi
+
+
 # Loop through the script names and execute them
 for i in ${need_to_start_server_shell[*]}; do
  chmod +x $i

scripts/start_component_check.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Copyright © 2023 OpenIM. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#Include shell font styles and some basic information
+SCRIPTS_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+
+#Include shell font styles and some basic information
+source $SCRIPTS_ROOT/style_info.sh
+source $SCRIPTS_ROOT/path_info.sh
+source $SCRIPTS_ROOT/function.sh
+
+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="$BIN_DIR"
+logs_dir="$OPENIM_ROOT/logs"
+
+cd ${component_check_binary_root}
+echo -e "${YELLOW_PREFIX}=======>$PWD${COLOR_SUFFIX}"
+cmd="./${component_check}"
+echo "==========================start components checking===========================">>$OPENIM_ROOT/logs/openIM.log
+$cmd
+
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+

tools/component/go.mod

@@ -0,0 +1,3 @@
+module github.com/OpenIMSDK/Open-IM-Server/tools/component
+
+go 1.19