diff --git a/docker-compose.yaml b/docker-compose.yaml index 2db2e38b0e..4904e5ab1d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -100,7 +100,7 @@ services: openim_server: - image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.0 #ghcr.io/openimsdk/openim-server:latels + image: ghcr.io/openimsdk/openim-server:main container_name: openim-server volumes: - ./logs:/openim/openim-server/logs @@ -122,7 +122,7 @@ services: max-file: "2" openim_chat: - image: ghcr.io/openimsdk/openim-chat:v1.1.0 #ghcr.io/openimsdk/openim-chat:latels + image: ghcr.io/openimsdk/openim-chat:main container_name: openim_chat volumes: - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs diff --git a/scripts/batch_start_all.sh b/scripts/batch_start_all.sh index 45ec813c59..0b5a17e516 100755 --- a/scripts/batch_start_all.sh +++ b/scripts/batch_start_all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 fd6ad6dcd0..166938629d 100755 --- a/scripts/build_all_service.sh +++ b/scripts/build_all_service.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/build_push_k8s_images.sh b/scripts/build_push_k8s_images.sh index a620c78474..4c92c17c2a 100755 --- a/scripts/build_push_k8s_images.sh +++ b/scripts/build_push_k8s_images.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 84dabb1eb0..1b816f17c2 100755 --- a/scripts/check_all.sh +++ b/scripts/check_all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/common.sh b/scripts/common.sh index 97d5968ba8..01d87366b4 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 fbb2b36fc2..1baa4da781 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 14ec819742..8f27caeddf 100755 --- a/scripts/docker_check_service.sh +++ b/scripts/docker_check_service.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 1033b53066..b285e84808 100755 --- a/scripts/docker_start_all.sh +++ b/scripts/docker_start_all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/ensure_tag.sh b/scripts/ensure_tag.sh index c6fea7ca0d..614233d102 100755 --- a/scripts/ensure_tag.sh +++ b/scripts/ensure_tag.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # diff --git a/scripts/enterprise/check_all.sh b/scripts/enterprise/check_all.sh index 271dfb4524..7a6d3773ba 100755 --- a/scripts/enterprise/check_all.sh +++ b/scripts/enterprise/check_all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/enterprise/function.sh b/scripts/enterprise/function.sh index 8b5cb0b2bf..f2abc5c1ed 100755 --- a/scripts/enterprise/function.sh +++ b/scripts/enterprise/function.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 35f918d809..1009cf4f55 100755 --- a/scripts/env_check.sh +++ b/scripts/env_check.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 e351c1ddb5..c247226ae1 100755 --- a/scripts/function.sh +++ b/scripts/function.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/githooks/commit-msg b/scripts/githooks/commit-msg index efff13fd03..a6344b30ef 100644 --- a/scripts/githooks/commit-msg +++ b/scripts/githooks/commit-msg @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIMSDK. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/githooks/pre-commit b/scripts/githooks/pre-commit index 91f5ad5313..32ff47e45b 100644 --- a/scripts/githooks/pre-commit +++ b/scripts/githooks/pre-commit @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIMSDK. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/githooks/pre-push b/scripts/githooks/pre-push index 2985313b72..0a1a88515a 100644 --- a/scripts/githooks/pre-push +++ b/scripts/githooks/pre-push @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIMSDK. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/install_im_server.sh b/scripts/install_im_server.sh index 0961193f16..ecc7005738 100755 --- a/scripts/install_im_server.sh +++ b/scripts/install_im_server.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/lib/color.sh b/scripts/lib/color.sh index c4bdefe255..b4ceab79ee 100755 --- a/scripts/lib/color.sh +++ b/scripts/lib/color.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/lib/golang.sh b/scripts/lib/golang.sh index 0d35e91988..15efa4ffd3 100755 --- a/scripts/lib/golang.sh +++ b/scripts/lib/golang.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/lib/init.sh b/scripts/lib/init.sh index 2946960876..c72459880e 100755 --- a/scripts/lib/init.sh +++ b/scripts/lib/init.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh index 092db55132..a39dcbe921 100755 --- a/scripts/lib/logging.sh +++ b/scripts/lib/logging.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/lib/release.sh b/scripts/lib/release.sh index a198e1ae61..bb426779e5 100755 --- a/scripts/lib/release.sh +++ b/scripts/lib/release.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -455,7 +455,7 @@ EOF mkdir -p "${release_stage}/release" cp -R "${OPENIM_ROOT}/scripts/release" "${release_stage}/" cat < "${release_stage}/release/get-openim-binaries.sh" -#!/usr/bin/env bash +#!/bin/bash # Copyright 2020 Lingfei Kong . All rights reserved. # Use of this source code is governed by a MIT style diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index 04eb21de76..abffc655f5 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/lib/version.sh b/scripts/lib/version.sh index 65f9bb353c..94c696d701 100755 --- a/scripts/lib/version.sh +++ b/scripts/lib/version.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh index cc6f0b5dd2..304515b7ea 100755 --- a/scripts/msg_gateway_start.sh +++ b/scripts/msg_gateway_start.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh index 7221ffa497..d8b5130700 100755 --- a/scripts/msg_transfer_start.sh +++ b/scripts/msg_transfer_start.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/path_info.sh b/scripts/path_info.sh index d3f6f4e1cd..31c7f4b068 100755 --- a/scripts/path_info.sh +++ b/scripts/path_info.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/push_start.sh b/scripts/push_start.sh index 6b26c3022d..af53de0ba8 100755 --- a/scripts/push_start.sh +++ b/scripts/push_start.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/release.sh b/scripts/release.sh index 9e1f99bc49..26e165c745 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/start_all.sh b/scripts/start_all.sh index 87363c5478..986ee784c7 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 2f27801bef..b2c8bd109f 100755 --- a/scripts/start_cron.sh +++ b/scripts/start_cron.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 f42f536c2c..44a33a2365 100755 --- a/scripts/start_rpc_service.sh +++ b/scripts/start_rpc_service.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 4fd3274070..996314a5f6 100755 --- a/scripts/stop_all.sh +++ b/scripts/stop_all.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/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 ff3a6330b7..b6b1f11bad 100755 --- a/scripts/style_info.sh +++ b/scripts/style_info.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test/common.sh b/test/common.sh index 904608894a..6395941a6a 100644 --- a/test/common.sh +++ b/test/common.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,4 +12,3 @@ # 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. -