diff --git a/docker-compose.yaml b/docker-compose.yaml index 4904e5ab1..1953e9965 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -100,12 +100,12 @@ services: openim_server: - image: ghcr.io/openimsdk/openim-server:main + image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.11 #ghcr.io/openimsdk/openim-server:main container_name: openim-server volumes: - - ./logs:/openim/openim-server/logs - - ./config:/openim/openim-server/config - - ./scripts:/openim/openim-server/scripts + - ./_output/openim/openim-server/logs:/openim/openim-server/logs + - ./_output/openim/openim-server/config:/openim/openim-server/config + - ./_output/openim/openim-server/scripts:/openim/openim-server/scripts restart: always depends_on: - zookeeper @@ -121,9 +121,9 @@ services: max-size: "1g" max-file: "2" - openim_chat: - image: ghcr.io/openimsdk/openim-chat:main - container_name: openim_chat + openim-chat: + image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.11 # ghcr.io/openimsdk/openim-chat:main + container_name: openim-chat volumes: - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs - ./_output/openim/openim-chat/config:/openim/openim-chat/config diff --git a/install.sh b/install.sh index 82756b4bb..59ac75a06 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/install_guide.sh b/install_guide.sh index 1c5f06fb9..a32bd24f4 100755 --- a/install_guide.sh +++ b/install_guide.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "Welcome to the Open-IM-Server installation scripts." echo "Please select an deploy option:" diff --git a/scripts/advertise.sh b/scripts/advertise.sh index c1cd63f56..9d47b5ac7 100755 --- a/scripts/advertise.sh +++ b/scripts/advertise.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e set -o pipefail diff --git a/scripts/batch_start_all.sh b/scripts/batch_start_all.sh index 0b5a17e51..45ec813c5 100755 --- a/scripts/batch_start_all.sh +++ b/scripts/batch_start_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 166938629..fd6ad6dcd 100755 --- a/scripts/build_all_service.sh +++ b/scripts/build_all_service.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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_push_k8s_images.sh b/scripts/build_push_k8s_images.sh index 4c92c17c2..a620c7847 100755 --- a/scripts/build_push_k8s_images.sh +++ b/scripts/build_push_k8s_images.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 1b816f17c..84dabb1eb 100755 --- a/scripts/check_all.sh +++ b/scripts/check_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 01d87366b..97d5968ba 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 1baa4da78..fbb2b36fc 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 8f27caedd..14ec81974 100755 --- a/scripts/docker_check_service.sh +++ b/scripts/docker_check_service.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 b285e8480..1033b5306 100755 --- a/scripts/docker_start_all.sh +++ b/scripts/docker_start_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 614233d10..c6fea7ca0 100755 --- a/scripts/ensure_tag.sh +++ b/scripts/ensure_tag.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright © 2023 OpenIM. All rights reserved. # diff --git a/scripts/enterprise/check_all.sh b/scripts/enterprise/check_all.sh index 7a6d3773b..271dfb452 100755 --- a/scripts/enterprise/check_all.sh +++ b/scripts/enterprise/check_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 f2abc5c1e..8b5cb0b2b 100755 --- a/scripts/enterprise/function.sh +++ b/scripts/enterprise/function.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 1009cf4f5..35f918d80 100755 --- a/scripts/env_check.sh +++ b/scripts/env_check.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 c247226ae..e351c1ddb 100755 --- a/scripts/function.sh +++ b/scripts/function.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 a6344b30e..efff13fd0 100644 --- a/scripts/githooks/commit-msg +++ b/scripts/githooks/commit-msg @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 32ff47e45..91f5ad531 100644 --- a/scripts/githooks/pre-commit +++ b/scripts/githooks/pre-commit @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 0a1a88515..2985313b7 100644 --- a/scripts/githooks/pre-push +++ b/scripts/githooks/pre-push @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright © 2023 OpenIMSDK. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/scripts/init_pwd.sh b/scripts/init_pwd.sh index f33c9b3dc..1e5fa3b34 100755 --- a/scripts/init_pwd.sh +++ b/scripts/init_pwd.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright © 2023 OpenIM. All rights reserved. # diff --git a/scripts/install_im_server.sh b/scripts/install_im_server.sh index ecc700573..0961193f1 100755 --- a/scripts/install_im_server.sh +++ b/scripts/install_im_server.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 b4ceab79e..c4bdefe25 100755 --- a/scripts/lib/color.sh +++ b/scripts/lib/color.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 15efa4ffd..0d35e9198 100755 --- a/scripts/lib/golang.sh +++ b/scripts/lib/golang.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 c72459880..294696087 100755 --- a/scripts/lib/init.sh +++ b/scripts/lib/init.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 a39dcbe92..092db5513 100755 --- a/scripts/lib/logging.sh +++ b/scripts/lib/logging.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 bb426779e..a198e1ae6 100755 --- a/scripts/lib/release.sh +++ b/scripts/lib/release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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" -#!/bin/bash +#!/usr/bin/env 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 abffc655f..04eb21de7 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 94c696d70..65f9bb353 100755 --- a/scripts/lib/version.sh +++ b/scripts/lib/version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 304515b7e..cc6f0b5dd 100755 --- a/scripts/msg_gateway_start.sh +++ b/scripts/msg_gateway_start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 d8b513070..7221ffa49 100755 --- a/scripts/msg_transfer_start.sh +++ b/scripts/msg_transfer_start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 31c7f4b06..d3f6f4e1c 100755 --- a/scripts/path_info.sh +++ b/scripts/path_info.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 af53de0ba..6b26c3022 100755 --- a/scripts/push_start.sh +++ b/scripts/push_start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 26e165c74..9e1f99bc4 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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_all.sh b/scripts/start_all.sh index 986ee784c..87363c547 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 b2c8bd109..2f27801be 100755 --- a/scripts/start_cron.sh +++ b/scripts/start_cron.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 44a33a236..f42f536c2 100755 --- a/scripts/start_rpc_service.sh +++ b/scripts/start_rpc_service.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 996314a5f..4fd327407 100755 --- a/scripts/stop_all.sh +++ b/scripts/stop_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/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 b6b1f11ba..ff3a6330b 100755 --- a/scripts/style_info.sh +++ b/scripts/style_info.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 6395941a6..e583fe8b3 100644 --- a/test/common.sh +++ b/test/common.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright © 2023 OpenIM. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License");