diff --git a/Dockerfile b/Dockerfile index 35431c598..6504f15ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,4 +28,4 @@ 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 -CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"] \ No newline at end of file +CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"] diff --git a/docker-compose.yaml b/docker-compose.yaml index 22da8e416..a845d7809 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -96,8 +96,9 @@ services: restart: always command: minio server /data --console-address ':9090' - openim_server: - image: ghcr.io/openimsdk/openim-server:latest + openim-server: + # image: ghcr.io/openimsdk/openim-server:latest + build: . container_name: openim-server volumes: - ./logs:/openim/openim-server/logs @@ -131,7 +132,7 @@ services: - mongodb - redis - minio - - openim_server + - openim-server network_mode: "host" logging: driver: json-file @@ -147,7 +148,7 @@ services: # ports: # - 9091:9091 depends_on: - - openim_server + - openim-server command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml" network_mode: "host" diff --git a/install.sh b/install.sh index 59ac75a06..38db46ed4 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/build_all_service.sh b/scripts/build_all_service.sh index fd6ad6dcd..24bb03665 100755 --- a/scripts/build_all_service.sh +++ b/scripts/build_all_service.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/check_all.sh b/scripts/check_all.sh index 84dabb1eb..ea9c2b5b7 100755 --- a/scripts/check_all.sh +++ b/scripts/check_all.sh @@ -61,7 +61,7 @@ check=$(ps aux | grep -w ./${openim_msgtransfer} | grep -v grep | wc -l) if [ $check -eq ${msg_transfer_service_num} ]; then echo -e ${GREEN_PREFIX}"none port has been listening,belongs service is openImMsgTransfer"${COLOR_SUFFIX} else - echo $check ${msg_transfer_service_num} + echo $check ${msg_transfer_service_num} echo -e ${RED_PREFIX}"openImMsgTransfer service does not start normally, num err"${COLOR_SUFFIX} echo -e ${RED_PREFIX}"please check $OPENIM_ROOT/logs/openIM.log "${COLOR_SUFFIX} exit -1 diff --git a/scripts/common.sh b/scripts/common.sh index 97d5968ba..421650374 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/coverage.sh b/scripts/coverage.sh index fbb2b36fc..ae5283671 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/docker_check_service.sh b/scripts/docker_check_service.sh index 14ec81974..b08c2aa7c 100755 --- a/scripts/docker_check_service.sh +++ b/scripts/docker_check_service.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/docker_start_all.sh b/scripts/docker_start_all.sh index 1033b5306..f617c5057 100755 --- a/scripts/docker_start_all.sh +++ b/scripts/docker_start_all.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/env_check.sh b/scripts/env_check.sh index 35f918d80..7cd9f83a3 100755 --- a/scripts/env_check.sh +++ b/scripts/env_check.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/function.sh b/scripts/function.sh index e351c1ddb..ea7b50c5a 100755 --- a/scripts/function.sh +++ b/scripts/function.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/start_cron.sh b/scripts/start_cron.sh index 5be85dbfe..ddd3661ae 100755 --- a/scripts/start_cron.sh +++ b/scripts/start_cron.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/start_rpc_service.sh b/scripts/start_rpc_service.sh index f42f536c2..51e13298f 100755 --- a/scripts/start_rpc_service.sh +++ b/scripts/start_rpc_service.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/stop_all.sh b/scripts/stop_all.sh index 51502171d..772e68d15 100755 --- a/scripts/stop_all.sh +++ b/scripts/stop_all.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/style_info.sh b/scripts/style_info.sh index ff3a6330b..452240035 100755 --- a/scripts/style_info.sh +++ b/scripts/style_info.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License");