From 734f2a5116d6f5356162f2c3c061d7e27738b1e7 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Sat, 9 Sep 2023 11:55:48 +0800 Subject: [PATCH] fix: fix openim web port Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/build-openim-web-image.yml | 4 ++-- CHANGELOG/CHANGELOG.md | 11 +++++++---- docker-compose.yml | 10 ++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-openim-web-image.yml b/.github/workflows/build-openim-web-image.yml index 471d7688e..6e8e7d823 100644 --- a/.github/workflows/build-openim-web-image.yml +++ b/.github/workflows/build-openim-web-image.yml @@ -84,7 +84,7 @@ jobs: id: meta2 uses: docker/metadata-action@v4.6.0 with: - images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server + images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web - name: Log in to AliYun Docker Hub uses: docker/login-action@v2 @@ -117,7 +117,7 @@ jobs: id: meta3 uses: docker/metadata-action@v4.6.0 with: - images: ghcr.io/openimsdk/openim-server + images: ghcr.io/openimsdk/openim-web - name: Log in to GitHub Container Registry uses: docker/login-action@v2 diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md index 41df11bba..2358b5fb8 100644 --- a/CHANGELOG/CHANGELOG.md +++ b/CHANGELOG/CHANGELOG.md @@ -89,9 +89,9 @@ $ git-chglog --config custom/dir/config.yml ## create next tag ```bash -git-chglog --next-tag 2.0.0 -o CHANGELOG.md -git commit -am "release 2.0.0" -git tag 2.0.0 +$ git-chglog --next-tag 2.0.0 -o CHANGELOG.md +$ git commit -am "release 2.0.0" +$ git tag 2.0.0 ``` | Query | Description | Example | @@ -112,6 +112,9 @@ git tag 2.0.0 + [OpenIM CHANGELOG-V2.9](CHANGELOG-2.9.md) + [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md) + [OpenIM CHANGELOG-V3.1](CHANGELOG-3.1.md) ++ [OpenIM CHANGELOG-V3.2](CHANGELOG-3.2.md) ++ [OpenIM CHANGELOG-V3.3](CHANGELOG-3.3.md) + ## Introduction @@ -121,7 +124,7 @@ In both the open-source and closed-source software development communities, it i The most common format for version numbers is as follows: -``` +```bash major.minor[.patch[.build]] ``` diff --git a/docker-compose.yml b/docker-compose.yml index b42bb0505..d8a441257 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -153,6 +153,8 @@ services: openim-web: image: ghcr.io/openimsdk/openim-web:latest + # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web:latest + # image: openim/openim-web:latest container_name: openim-web environment: - OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH} @@ -165,8 +167,8 @@ services: ipv4_address: ${OPENIM_WEB_NETWORK_ADDRESS} # openim-server: -# # image: ghcr.io/openimsdk/openim-server:main -# image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:release-v3.3 +# image: ghcr.io/openimsdk/openim-server:main +# # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:release-v3.3 # # image: openim/openim-server:main # # build: . # container_name: openim-server @@ -200,8 +202,8 @@ services: # ipv4_address: ${OPENIM_SERVER_NETWORK_ADDRESS} # openim-chat: - # # image: ghcr.io/openimsdk/openim-chat:main - # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-chat:main + # image: ghcr.io/openimsdk/openim-chat:main + # # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-chat:main # # image: ghcr.io/openimsdk/openim-chat:main # container_name: openim-chat # healthcheck: