feat: update openim-web

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
2025-10-26 05:02:11 +08:00 · 2023-08-30 18:33:55 +08:00 · 2023-08-30 18:33:55 +08:00 · d84420d737
commit d84420d737
parent e447ac3940
18 changed files with 26 additions and 17 deletions
--- a/.env
+++ b/.env
@ -11,7 +11,6 @@ API_URL=http://127.0.0.1:10002
 # Directory path for storing data files or related information
 DATA_DIR=./

-
 # ============ Component Extension Configuration ==========
 # Address or hostname for the ZooKeeper service (often used in distributed systems for maintaining configuration information)
 ZOOKEEPER_ADDRESS=127.0.0.1
--- a/build/images/openim-api/Dockerfile
+++ b/build/images/openim-api/Dockerfile
@ -47,6 +47,6 @@ ENV CONFIG=/openim/openim-server/config

 EXPOSE $PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api /usr/bin/openim-api

 CMD ["bash", "-c", "openim-api -c $CONFIG --port $PORT"]
--- a/build/images/openim-cmdutils/Dockerfile
+++ b/build/images/openim-cmdutils/Dockerfile
@ -42,7 +42,7 @@ WORKDIR /openim/openim-server
 COPY --from=builder $OPENIM_SERVER_BINDIR/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils /usr/bin/openim-cmdutils
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils /usr/bin/openim-cmdutils

 ENTRYPOINT ["openim-cmdutils"]

--- a/build/images/openim-crontask/Dockerfile
+++ b/build/images/openim-crontask/Dockerfile
@ -43,6 +43,6 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config

 ENV CONFIG=/openim/openim-server/config

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask /usr/bin/openim-crontask
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask /usr/bin/openim-crontask

 CMD ["bash", "-c", "openim-crontask -c $CONFIG"]
--- a/build/images/openim-msggateway/Dockerfile
+++ b/build/images/openim-msggateway/Dockerfile
@ -48,6 +48,6 @@ ENV CONFIG=/openim/openim-server/config
 EXPOSE $PORT
 EXPOSE $WS_PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway /usr/bin/openim-msggateway
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway /usr/bin/openim-msggateway

 CMD ["bash", "-c", "openim-msggateway -c $CONFIG --port $PORT --ws_port $WS_PORT"]
--- a/build/images/openim-msgtransfer/Dockerfile
+++ b/build/images/openim-msgtransfer/Dockerfile
@ -41,6 +41,6 @@ WORKDIR /openim/openim-server
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer /usr/bin/openim-msgtransfer
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer /usr/bin/openim-msgtransfer

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-msgtransfer -c $CONFIG --prometheus_port $PROMETHEUS_PORT; else openim-msgtransfer -c $CONFIG; fi"]
--- a/build/images/openim-push/Dockerfile
+++ b/build/images/openim-push/Dockerfile
@ -48,6 +48,6 @@ ENV PORT 10170 \

 EXPOSE $PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push /usr/bin/openim-push
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push /usr/bin/openim-push

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then openim-push -c $CONFIG --port $PORT --prometheus_port $PROMETHEUS_PORT; else openim-push -c $CONFIG --port $PORT; fi"]
--- a/build/images/openim-rpc-auth/Dockerfile
+++ b/build/images/openim-rpc-auth/Dockerfile
@ -47,6 +47,6 @@ ENV CONFIG=/openim/openim-server/config

 EXPOSE $PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth /usr/bin/openim-rpc-auth
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth /usr/bin/openim-rpc-auth

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-auth --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-auth --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-rpc-conversation/Dockerfile
+++ b/build/images/openim-rpc-conversation/Dockerfile
@ -49,6 +49,6 @@ ENV PORT 10230 \
 EXPOSE $PORT
 EXPOSE $PROMETHEUS_PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation /usr/bin/openim-rpc-conversation
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation /usr/bin/openim-rpc-conversation

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-conversation --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-conversation --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-rpc-friend/Dockerfile
+++ b/build/images/openim-rpc-friend/Dockerfile
@ -49,6 +49,6 @@ ENV PORT 10120 \
 EXPOSE $PORT
 EXPOSE $PROMETHEUS_PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend /usr/bin/openim-rpc-friend
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend /usr/bin/openim-rpc-friend

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-friend --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-friend --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-rpc-group/Dockerfile
+++ b/build/images/openim-rpc-group/Dockerfile
@ -49,6 +49,6 @@ ENV PORT 10150 \
 EXPOSE $PORT
 EXPOSE $PROMETHEUS_PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group /usr/bin/openim-rpc-group
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group /usr/bin/openim-rpc-group

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-group --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-group --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-rpc-msg/Dockerfile
+++ b/build/images/openim-rpc-msg/Dockerfile
@ -49,6 +49,6 @@ ENV PORT 10130 \
 EXPOSE $PORT
 EXPOSE $PROMETHEUS_PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg /usr/bin/openim-rpc-msg
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg /usr/bin/openim-rpc-msg

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-msg --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-msg --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-rpc-third/Dockerfile
+++ b/build/images/openim-rpc-third/Dockerfile
@ -48,6 +48,6 @@ ENV PORT 10200 \

 EXPOSE $PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third /usr/bin/openim-rpc-third
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third /usr/bin/openim-rpc-third

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-third --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-third --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-rpc-user/Dockerfile
+++ b/build/images/openim-rpc-user/Dockerfile
@ -47,6 +47,6 @@ ENV PORT 10110 \

 EXPOSE $PORT

-RUN cp -r ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user /usr/bin/openim-rpc-user
+RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user /usr/bin/openim-rpc-user

 ENTRYPOINT ["bash", "-c", "if [[ -n $PROMETHEUS_PORT ]]; then "openim-rpc-user --port $PORT -c $CONFIG" --prometheus_port $PROMETHEUS_PORT; else "openim-rpc-user --port $PORT -c $CONFIG"; fi"]
--- a/build/images/openim-tools/openim-web/Dockerfile
+++ b/build/images/openim-tools/openim-web/Dockerfile
@ -52,6 +52,6 @@ ENV DISTPATH /openim/openim-server/dist

 EXPOSE $PORT

-RUN ln ${OPENIM_SERVER_BINDIR}/tools/$(get_os)/$(get_arch)/openim-web /usr/bin/openim-web
+RUN mv ${OPENIM_SERVER_BINDIR}/tools/$(get_os)/$(get_arch)/openim-web /usr/bin/openim-web

 ENTRYPOINT ["bash", "-c", "openim-web -port $PORT -distPath $DISTPATH"]
--- a/deployments/templates/env_template.yaml
+++ b/deployments/templates/env_template.yaml
@ -32,6 +32,7 @@ DATA_DIR=${DATA_DIR}
 # ============ Component Extension Configuration ==========
 # Address or hostname for the ZooKeeper service (often used in distributed systems for maintaining configuration information)
 ZOOKEEPER_ADDRESS=${ZOOKEEPER_ADDRESS}
+ZOOKEEPER_PORT=${ZOOKEEPER_PORT}

 # Port on which MySQL database service is running
 MYSQL_PORT=${MYSQL_PORT}
@ -83,4 +84,9 @@ MINIO_SECRET_KEY=${MINIO_SECRET_KEY}

 # ================== OpenIM Web ===========================
 OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH}
-OPENIM_WEB_PPRT=${OPENIM_WEB_PPRT}
+OPENIM_WEB_PPRT=${OPENIM_WEB_PPRT}
+
+
+# =================== BRANCH NAME =========================
+CHAT_BRANCH=${CHAT_BRANCH}
+SERVER_BRANCH=${SERVER_BRANCH}
--- a/install.sh
+++ b/install.sh
@ -20,7 +20,6 @@
 set -e
 set -o pipefail

-
 ############################## OpenIM Github ##############################
 # ... rest of the script ...

--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@ -61,6 +61,11 @@ mkdir -p ${INSTALL_DIR}

 def "ENV_FILE" ""${OPENIM_ROOT}"/scripts/install/environment.sh"

+###################### Docker compose ###################
+# OPENIM AND CHAT 
+def "CHAT_BRANCH" "main"
+def "SERVER_BRANCH" "main"
+
 ###################### openim 配置 ######################
 # read: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/deployment/init/README.md
 def "OPENIM_DATA_DIR" "/data/openim"