diff --git a/scripts/check-all.sh b/scripts/check-all.sh index 1d05f838b..8e89af79d 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -26,8 +26,8 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${OPENIM_ROOT}/scripts/install/common.sh" -if grep -q docker /proc/1/cgroup; then - exec > ${DOCKER_LOG_FILE} 2>&1 +if openim::util::is_running_in_container; then + exec >> ${DOCKER_LOG_FILE} 2>&1 fi @@ -75,7 +75,7 @@ if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then openim::color::echo ${COLOR_CYAN} "Environment in the interior of the container" else openim::color::echo ${COLOR_CYAN} "The environment is outside the container" - openim::util::check_ports ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]} || return 0 + openim::util::check_ports ${OPENIM_DEPENDENCY_PORT_LISTARIES[@]} fi if [[ $? -ne 0 ]]; then diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh index 0d5113541..fec71b19d 100755 --- a/scripts/lib/logging.sh +++ b/scripts/lib/logging.sh @@ -28,7 +28,7 @@ fi LOG_FILE="${OPENIM_OUTPUT}/logs/openim-$(date '+%Y%m%d').log" STDERR_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-error-$(date '+%Y%m%d').log" TMP_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-tmp-$(date '+%Y%m%d').log" - +DOCKER_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-docker.log" if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then mkdir -p "${OPENIM_OUTPUT}/logs" touch "$LOG_FILE" diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index d84562c1d..e9908ae66 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -2866,6 +2866,15 @@ function openim::util::gen_os_arch() { +function openim::util::is_running_in_container() { + if grep -qE 'docker|kubepods' /proc/1/cgroup || [ -f /.dockerenv ]; then + return 0 + else + return 1 + fi +} + + function openim::util::check_process_names_for_stop() { local all_stopped=true for service in "${OPENIM_ALL_SERVICE_LIBRARIES[@]}"; do diff --git a/scripts/start-all.sh b/scripts/start-all.sh index fcf9496cc..419c16628 100755 --- a/scripts/start-all.sh +++ b/scripts/start-all.sh @@ -62,7 +62,7 @@ function execute_start_scripts() { -if grep -q docker /proc/1/cgroup; then +if openim::util::is_running_in_container; then exec > ${DOCKER_LOG_FILE} 2>&1 fi