diff --git a/scripts/check-all.sh b/scripts/check-all.sh index 8435808de..19d9fab7f 100755 --- a/scripts/check-all.sh +++ b/scripts/check-all.sh @@ -26,12 +26,8 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${OPENIM_ROOT}/scripts/install/common.sh" -if openim::util::is_running_in_container; then - echo "container!!!!11111111111" +if is_running_in_container; then exec > ${DOCKER_LOG_FILE} 2>&1 - -else - echo "host!!!!11111111111" fi @@ -79,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/start-all.sh b/scripts/start-all.sh index 020b3ba3d..b07a62ec0 100755 --- a/scripts/start-all.sh +++ b/scripts/start-all.sh @@ -62,12 +62,8 @@ function execute_start_scripts() { -if openim::util::is_running_in_container; then - echo "container!!!!11111111111" +if is_running_in_container; then exec > ${DOCKER_LOG_FILE} 2>&1 - -else - echo "host!!!!11111111111" fi