From 8b5de4b30bb7930761629dd302564ccb0ffa6a12 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Wed, 23 Aug 2023 14:39:10 +0800
Subject: [PATCH] feat: add test changelog file

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 .github/workflows/golangci-lint.yml |  2 +-
 .github/workflows/openimci.yml      |  1 +
 scripts/install-im-server.sh        | 22 ++++++++++++----------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 518909aed..eb9150629 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -42,7 +42,7 @@ jobs:
             # 
             # Note: by default the `.golangci.yml` file should be at the root of the repository.
             # The location of the configuration file can be changed by using `--config=`
-            args: --timeout=30m --config=/scripts/golangci.yml # --issues-exit-code=0
+            args: --config=./scripts/golangci.yml # --timeout=30m  --issues-exit-code=0
 
             # Optional: show only new issues if it's a pull request. The default value is `false`.
             only-new-issues: true
diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml
index 8ff273f20..626841d3c 100644
--- a/.github/workflows/openimci.yml
+++ b/.github/workflows/openimci.yml
@@ -162,6 +162,7 @@ jobs:
 
     - name: Build, Start and Check Services
       run: |
+        sudo make init
         sudo make build
         sudo make start
         sudo make check
diff --git a/scripts/install-im-server.sh b/scripts/install-im-server.sh
index 54da74aa0..2dd4e10b8 100755
--- a/scripts/install-im-server.sh
+++ b/scripts/install-im-server.sh
@@ -31,17 +31,19 @@ openim::util::ensure_docker_daemon_connectivity
 
 DOCKER_COMPOSE_COMMAND=
 # Check if docker-compose command is available
-if command -v docker-compose &> /dev/null
+if command -v docker compose &> /dev/null
 then
-    openim::log::info "docker-compose command is available"
-    DOCKER_COMPOSE_COMMAND="docker-compose"
-else
+    openim::log::info "docker compose command is available"
     DOCKER_COMPOSE_COMMAND="docker compose"
+else
+    DOCKER_COMPOSE_COMMAND="docker-compose"
 fi
 
-pushd "${OPENIM_ROOT}" >/dev/null
-  ${DOCKER_COMPOSE_COMMAND} up -d
-  sleep 60
-  ${DOCKER_COMPOSE_COMMAND} logs
-  ${DOCKER_COMPOSE_COMMAND} ps
-popd >/dev/null
+pushd "${OPENIM_ROOT}"
+
+${DOCKER_COMPOSE_COMMAND} up -d
+sleep 60
+${DOCKER_COMPOSE_COMMAND} logs
+${DOCKER_COMPOSE_COMMAND} ps
+
+popd