mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-10-27 05:52:29 +08:00
fix: fix docker compose file
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
parent
2628874a26
commit
10a0bd09e3
2
.github/workflows/openimci.yml
vendored
2
.github/workflows/openimci.yml
vendored
@ -151,7 +151,7 @@ jobs:
|
|||||||
version: 2.x
|
version: 2.x
|
||||||
- name: Docker Operations
|
- name: Docker Operations
|
||||||
run: |
|
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 docker compose up -d
|
||||||
sudo sleep 60
|
sudo sleep 60
|
||||||
|
|
||||||
|
|||||||
@ -166,7 +166,7 @@ Deploy basic components at the click of a command:
|
|||||||
```bash
|
```bash
|
||||||
# install openim dependency
|
# 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
|
$ 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.
|
> `make help` to help you see the instructions supported by OpenIM.
|
||||||
|
|||||||
@ -25,7 +25,6 @@ source "${OPENIM_ROOT}/scripts/lib/init.sh"
|
|||||||
trap 'openim::util::onCtrlC' INT
|
trap 'openim::util::onCtrlC' INT
|
||||||
|
|
||||||
chmod +x "${OPENIM_ROOT}"/scripts/*.sh
|
chmod +x "${OPENIM_ROOT}"/scripts/*.sh
|
||||||
"${OPENIM_ROOT}"/scripts/init-config.sh
|
|
||||||
|
|
||||||
openim::util::ensure_docker_daemon_connectivity
|
openim::util::ensure_docker_daemon_connectivity
|
||||||
|
|
||||||
@ -40,10 +39,12 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
pushd "${OPENIM_ROOT}"
|
pushd "${OPENIM_ROOT}"
|
||||||
|
${DOCKER_COMPOSE_COMMAND} stop
|
||||||
${DOCKER_COMPOSE_COMMAND} up -d
|
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
|
sleep 60
|
||||||
${DOCKER_COMPOSE_COMMAND} logs
|
${DOCKER_COMPOSE_COMMAND} logs openim-server
|
||||||
${DOCKER_COMPOSE_COMMAND} ps
|
${DOCKER_COMPOSE_COMMAND} ps
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user