diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml index 626841d3c..ff5dc947e 100644 --- a/.github/workflows/openimci.yml +++ b/.github/workflows/openimci.yml @@ -151,7 +151,7 @@ jobs: version: 2.x - name: Docker Operations run: | - curl -o docker-compose.yaml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml + curl -o docker-compose.yml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml sudo docker compose up -d sudo sleep 60 diff --git a/README.md b/README.md index d1af632bf..3ce8fe030 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,7 @@ Deploy basic components at the click of a command: ```bash # install openim dependency $ git clone https://github.com/openimsdk/open-im-server openim/openim-server && export openim=$(pwd)/openim/openim-server && cd $openim/openim-server && git checkout $OPENIM_VERSION -$ make init && docker compose -f basic-openim-server-dependency.yml up -d && make start && make check +$ make init && docker compose up -d && make start && make check ``` > `make help` to help you see the instructions supported by OpenIM. diff --git a/scripts/install-im-server.sh b/scripts/install-im-server.sh index b542385b6..76d5120fe 100755 --- a/scripts/install-im-server.sh +++ b/scripts/install-im-server.sh @@ -25,7 +25,6 @@ source "${OPENIM_ROOT}/scripts/lib/init.sh" trap 'openim::util::onCtrlC' INT chmod +x "${OPENIM_ROOT}"/scripts/*.sh -"${OPENIM_ROOT}"/scripts/init-config.sh openim::util::ensure_docker_daemon_connectivity @@ -40,10 +39,12 @@ else fi pushd "${OPENIM_ROOT}" - -${DOCKER_COMPOSE_COMMAND} up -d +${DOCKER_COMPOSE_COMMAND} stop +curl https://gitee.com/openimsdk/openim-docker/raw/main/example/full-openim-server-and-chat.yml -o docker-compose.yml && make init && docker compose up -d +"${OPENIM_ROOT}"/scripts/init-config.sh +${DOCKER_COMPOSE_COMMAND} up --remove-orphans -d sleep 60 -${DOCKER_COMPOSE_COMMAND} logs +${DOCKER_COMPOSE_COMMAND} logs openim-server ${DOCKER_COMPOSE_COMMAND} ps popd