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/Dockerfile b/Dockerfile index 5bd3930e0..f738d4457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ WORKDIR ${SERVER_WORKDIR} # Copy scripts and binary files to the production image COPY --from=builder ${OPENIM_SERVER_BINDIR} /openim/openim-server/_output/bin -COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts -COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config +# COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts +# COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config CMD ["/openim/openim-server/scripts/docker-start-all.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 05806427d..543d5558f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -203,4 +203,4 @@ services: # - prometheus # networks: # openim-server: -# ipv4_address: ${GRAFANA_NETWORK_ADDRESS} +# ipv4_address: ${GRAFANA_NETWORK_ADDRESS} \ No newline at end of file diff --git a/scripts/install/openim-push.sh b/scripts/install/openim-push.sh index e57edfaf6..aa5ebe7d4 100755 --- a/scripts/install/openim-push.sh +++ b/scripts/install/openim-push.sh @@ -71,7 +71,7 @@ function openim::push::start() for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}" - nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2>&1 & + nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2>&1 & done openim::util::check_process_names ${SERVER_NAME}