diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml index 6083fb086..82dca6404 100644 --- a/.github/workflows/openimci.yml +++ b/.github/workflows/openimci.yml @@ -14,9 +14,11 @@ jobs: - name: Run Docker Compose run: | - make init + ./scripts/init-config.sh --force docker-compose up -d docker-compose ps + docker-compose logs openim-server + docker-compose logs openim-chat docker-compose down test-example: @@ -31,7 +33,7 @@ jobs: - 'example/only-openim-server.yml' - 'example/only-openim-web.yml' - 'example/volume-all-server.yml' - + steps: - name: Checkout repository uses: actions/checkout@v2 @@ -41,7 +43,7 @@ jobs: - name: Run Docker ${{ matrix.compose-file }} Compose run: | - make init + ./scripts/init-config.sh --force docker-compose -f ${{ matrix.compose-file }} up -d docker-compose -f ${{ matrix.compose-file }} ps docker-compose -f ${{ matrix.compose-file }} down \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 46fbe3bf1..c6e5047a7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -161,7 +161,7 @@ services: ipv4_address: ${OPENIM_SERVER_NETWORK_ADDRESS:-172.28.0.8} openim-chat: - image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-chat:${CHAT_IMAGE_VERSION:-latest} + image: openim-chat:test container_name: openim-chat healthcheck: test: ["CMD", "/openim/openim-chat/scripts/check_all.sh"] @@ -175,12 +175,15 @@ services: - ZOOKEEPER_PORT=${ZOOKEEPER_PORT:-12181} - OPENIM_SERVER_ADDRESS=${DOCKER_BRIDGE_GATEWAY:-172.28.0.1} - API_OPENIM_PORT=${API_OPENIM_PORT:-10002} + # - MYSQL_ADDRESS=${DOCKER_BRIDGE_GATEWAY:-172.28.0.1} + # - MYSQL_PORT=${MYSQL_PORT:-13306} + - REDIS_ADDRESS=${DOCKER_BRIDGE_GATEWAY:-172.28.0.1} + - REDIS_PORT=${REDIS_PORT:-16379} ports: - "${OPENIM_CHAT_API_PORT:-10008}:10008" - "${OPENIM_ADMIN_API_PORT:-10009}:10009" volumes: - "./openim-chat/logs:/openim/openim-chat/logs" - - "./openim-chat/_output/logs:/openim/openim-chat/_output/logs" - "./openim-chat/config:/openim/openim-chat/config" restart: always user: root:root @@ -189,6 +192,7 @@ services: - mongodb - redis - minio + - openim-server logging: driver: json-file options: diff --git a/scripts/clean.sh b/scripts/clean.sh index 2b5eb300f..a346ecb72 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -72,6 +72,8 @@ fi pushd $OPENIM_ROOT delete_dir "$DATA_DIR/components" delete_dir "$DATA_DIR/openim-server/config" +delete_dir "$DATA_DIR/openim-server/logs" delete_dir "$DATA_DIR/openim-chat/config" +delete_dir "$DATA_DIR/openim-chat/logs" docker network prune -f popd